X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface.h;h=c3f24af05a7505e4374a98111ae2642d5ab26193;hb=9c0f9c65093cfa53d45f9b68782321eb8063a032;hp=e7807ffc17817b84826814f18489e7dd4919b94b;hpb=a3f8ceb929420a0be2b2c8341382fdfe0a50b859;p=catta diff --git a/avahi-core/iface.h b/avahi-core/iface.h index e7807ff..c3f24af 100644 --- a/avahi-core/iface.h +++ b/avahi-core/iface.h @@ -1,21 +1,19 @@ #ifndef fooifacehfoo #define fooifacehfoo -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -30,7 +28,7 @@ typedef struct AvahiHwInterface AvahiHwInterface; #include #include -#include "server.h" +#include "internal.h" #include "cache.h" #include "response-sched.h" #include "query-sched.h" @@ -39,9 +37,26 @@ typedef struct AvahiHwInterface AvahiHwInterface; #include "announce.h" #include "browse.h" #include "querier.h" + +#ifdef HAVE_NETLINK #include "iface-linux.h" +#elif defined(HAVE_PF_ROUTE) +#include "iface-pfroute.h" +#else +typedef struct AvahiInterfaceMonitorOSDep AvahiInterfaceMonitorOSDep; +struct AvahiInterfaceMonitorOSDep { + + unsigned query_addr_seq, query_link_seq; + + enum { + LIST_IFACE, + LIST_ADDR, + LIST_DONE + } list; +}; +#endif -#define AVAHI_MAX_MAC_ADDRESS 32 +#define AVAHI_MAC_ADDRESS_MAX 32 struct AvahiInterfaceMonitor { AvahiServer *server; @@ -62,14 +77,18 @@ struct AvahiHwInterface { char *name; AvahiIfIndex index; int flags_ok; - + unsigned mtu; - uint8_t mac_address[AVAHI_MAX_MAC_ADDRESS]; + uint8_t mac_address[AVAHI_MAC_ADDRESS_MAX]; size_t mac_address_size; AvahiSEntryGroup *entry_group; + /* Packet rate limiting */ + struct timeval ratelimit_begin; + unsigned ratelimit_counter; + AVAHI_LLIST_HEAD(AvahiInterface, interfaces); }; @@ -79,9 +98,11 @@ struct AvahiInterface { AVAHI_LLIST_FIELDS(AvahiInterface, interface); AVAHI_LLIST_FIELDS(AvahiInterface, by_hardware); - + AvahiProtocol protocol; int announcing; + AvahiAddress local_mcast_address; + int mcast_joined; AvahiCache *cache; @@ -90,7 +111,7 @@ struct AvahiInterface { AvahiProbeScheduler *probe_scheduler; AVAHI_LLIST_HEAD(AvahiInterfaceAddress, addresses); - AVAHI_LLIST_HEAD(AvahiAnnouncement, announcements); + AVAHI_LLIST_HEAD(AvahiAnnouncer, announcers); AvahiHashmap *queriers_by_key; AVAHI_LLIST_HEAD(AvahiQuerier, queriers); @@ -106,7 +127,8 @@ struct AvahiInterfaceAddress { unsigned prefix_len; int global_scope; - + int deprecated; + AvahiSEntryGroup *entry_group; }; @@ -115,9 +137,26 @@ void avahi_interface_monitor_free(AvahiInterfaceMonitor *m); int avahi_interface_monitor_init_osdep(AvahiInterfaceMonitor *m); void avahi_interface_monitor_free_osdep(AvahiInterfaceMonitor *m); - void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m); +typedef void (*AvahiInterfaceMonitorWalkCallback)(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata); +void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, void* userdata); +int avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, void* userdata); + +void avahi_interface_monitor_update_rrs(AvahiInterfaceMonitor *m, int remove_rrs); +int avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a); +void avahi_interface_monitor_check_relevant(AvahiInterfaceMonitor *m); + +/* AvahiHwInterface */ + +AvahiHwInterface *avahi_hw_interface_new(AvahiInterfaceMonitor *m, AvahiIfIndex idx); +void avahi_hw_interface_free(AvahiHwInterface *hw, int send_goodbye); + +void avahi_hw_interface_update_rrs(AvahiHwInterface *hw, int remove_rrs); +void avahi_hw_interface_check_relevant(AvahiHwInterface *hw); + +AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, int idx); + /* AvahiInterface */ AvahiInterface* avahi_interface_new(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, AvahiProtocol protocol); @@ -130,7 +169,8 @@ int avahi_interface_is_relevant(AvahiInterface *i); void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p); void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port); -int avahi_interface_post_query(AvahiInterface *i, AvahiKey *k, int immediately); +int avahi_interface_post_query(AvahiInterface *i, AvahiKey *k, int immediately, unsigned *ret_id); +int avahi_interface_withraw_query(AvahiInterface *i, unsigned id); int avahi_interface_post_response(AvahiInterface *i, AvahiRecord *record, int flush_cache, const AvahiAddress *querier, int immediately); int avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *p, int immediately); @@ -140,38 +180,16 @@ int avahi_interface_has_address(AvahiInterfaceMonitor *m, AvahiIfIndex iface, co AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol); -/* AvahiHwInterface */ - -AvahiHwInterface *avahi_hw_interface_new(AvahiInterfaceMonitor *m, AvahiIfIndex idx); -void avahi_hw_interface_free(AvahiHwInterface *hw, int send_goodbye); - -void avahi_hw_interface_update_rrs(AvahiHwInterface *hw, int remove_rrs); -void avahi_hw_interface_check_relevant(AvahiHwInterface *hw); - - AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, int idx); - /* AvahiInterfaceAddress */ AvahiInterfaceAddress *avahi_interface_address_new(AvahiInterfaceMonitor *m, AvahiInterface *i, const AvahiAddress *addr, unsigned prefix_len); -void avahi_interface_address_update_rrs(AvahiInterfaceAddress *a, int remove_rrs); void avahi_interface_address_free(AvahiInterfaceAddress *a); -int avahi_interface_address_is_relevant(AvahiInterfaceAddress *a); -AvahiInterfaceAddress* avahi_interface_monitor_get_address(AvahiInterfaceMonitor *m, AvahiInterface *i, const AvahiAddress *raddr); - +void avahi_interface_address_update_rrs(AvahiInterfaceAddress *a, int remove_rrs); +int avahi_interface_address_is_relevant(AvahiInterfaceAddress *a); +AvahiInterfaceAddress* avahi_interface_monitor_get_address(AvahiInterfaceMonitor *m, AvahiInterface *i, const AvahiAddress *raddr); -int avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, void* userdata); - -typedef void (*AvahiInterfaceMonitorWalkCallback)(AvahiInterfaceMonitor *m, AvahiInterface *i, void* userdata); - -void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, void* userdata); - -void avahi_interface_monitor_update_rrs(AvahiInterfaceMonitor *m, int remove_rrs); - -int avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a); - -void avahi_interface_monitor_check_relevant(AvahiInterfaceMonitor *m); - +AvahiIfIndex avahi_find_interface_for_address(AvahiInterfaceMonitor *m, const AvahiAddress *a); #endif