X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface.c;h=f5373e6392add43ab6a34073e58e8b97a4edf0f2;hb=af548e38c2c282132ddac2a75a76218ff3be3175;hp=7972a5c02e3ff3bf4403624fe2ffeac4f216458b;hpb=768d6a386735d3a0805547a2de728886f2aa8798;p=catta diff --git a/avahi-core/iface.c b/avahi-core/iface.c index 7972a5c..f5373e6 100644 --- a/avahi-core/iface.c +++ b/avahi-core/iface.c @@ -30,6 +30,10 @@ #include #include #include +#include + +#include +#include #include "iface.h" #include "netlink.h" @@ -39,105 +43,137 @@ #include "util.h" #include "log.h" -static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, gboolean remove) { - g_assert(m); - g_assert(a); +static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, int remove_rrs) { + assert(m); + assert(a); if (avahi_interface_address_relevant(a) && - !remove && + !remove_rrs && m->server->config.publish_addresses && (m->server->state == AVAHI_SERVER_RUNNING || m->server->state == AVAHI_SERVER_REGISTERING)) { - if (!a->entry_group) { - a->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); - avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address); - avahi_entry_group_commit(a->entry_group); + /* Fill the entry group */ + if (!a->entry_group) + a->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); + + if (!a->entry_group) /* OOM */ + return; + + if (avahi_s_entry_group_is_empty(a->entry_group)) { + + if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address) < 0) { + avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error)); + avahi_s_entry_group_free(a->entry_group); + a->entry_group = NULL; + return; + } + + avahi_s_entry_group_commit(a->entry_group); } } else { - if (a->entry_group) { + /* Clear the entry group */ - if (avahi_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) + if (a->entry_group && !avahi_s_entry_group_is_empty(a->entry_group)) { + + if (avahi_s_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) avahi_server_decrease_host_rr_pending(m->server); - avahi_entry_group_free(a->entry_group); - a->entry_group = NULL; + avahi_s_entry_group_reset(a->entry_group); } } } -static void update_interface_rr(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean remove) { +static void update_interface_rr(AvahiInterfaceMonitor *m, AvahiInterface *i, int remove_rrs) { AvahiInterfaceAddress *a; - g_assert(m); - g_assert(i); + assert(m); + assert(i); for (a = i->addresses; a; a = a->address_next) - update_address_rr(m, a, remove); + update_address_rr(m, a, remove_rrs); } -static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, gboolean remove) { +static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, int remove_rrs) { AvahiInterface *i; - g_assert(m); - g_assert(hw); + assert(m); + assert(hw); for (i = hw->interfaces; i; i = i->by_hardware_next) - update_interface_rr(m, i, remove); + update_interface_rr(m, i, remove_rrs); - if (!remove && + if (!remove_rrs && m->server->config.publish_workstation && (m->server->state == AVAHI_SERVER_RUNNING || m->server->state == AVAHI_SERVER_REGISTERING)) { - if (!hw->entry_group) { - gchar *name; - gchar *t = avahi_format_mac_address(hw->mac_address, hw->mac_address_size); - name = g_strdup_printf("%s [%s]", m->server->host_name, t); - g_free(t); - - hw->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); - avahi_server_add_service(m->server, hw->entry_group, hw->index, AF_UNSPEC, "_workstation._tcp", name, NULL, NULL, 9, NULL); - avahi_entry_group_commit(hw->entry_group); + if (!hw->entry_group) + hw->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); + + if (!hw->entry_group) + return; /* OOM */ + + if (avahi_s_entry_group_is_empty(hw->entry_group)) { + char *name; + char *t; - g_free(name); + if (!(t = avahi_format_mac_address(hw->mac_address, hw->mac_address_size))) + return; /* OOM */ + + name = avahi_strdup_printf("%s [%s]", m->server->host_name, t); + avahi_free(t); + + if (!name) + return; /* OOM */ + + if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, name, "_workstation._tcp", NULL, NULL, 9, NULL) < 0) { + avahi_log_warn(__FILE__": avahi_server_add_service() failed."); + avahi_s_entry_group_free(hw->entry_group); + hw->entry_group = NULL; + } else + avahi_s_entry_group_commit(hw->entry_group); + + avahi_free(name); } } else { - if (hw->entry_group) { + if (hw->entry_group && !avahi_s_entry_group_is_empty(hw->entry_group)) { - if (avahi_entry_group_get_state(hw->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) + if (avahi_s_entry_group_get_state(hw->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) avahi_server_decrease_host_rr_pending(m->server); - avahi_entry_group_free(hw->entry_group); - hw->entry_group = NULL; + avahi_s_entry_group_reset(hw->entry_group); } } } static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) { - g_assert(m); - g_assert(a); - g_assert(a->interface); + assert(m); + assert(a); + assert(a->interface); - update_address_rr(m, a, TRUE); + update_address_rr(m, a, 1); AVAHI_LLIST_REMOVE(AvahiInterfaceAddress, address, a->interface->addresses, a); + + if (a->entry_group) + avahi_s_entry_group_free(a->entry_group); - g_free(a); + avahi_free(a); } -static void free_interface(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean send_goodbye) { - g_assert(m); - g_assert(i); +static void free_interface(AvahiInterfaceMonitor *m, AvahiInterface *i, int send_goodbye) { + assert(m); + assert(i); avahi_goodbye_interface(m->server, i, send_goodbye); avahi_response_scheduler_force(i->response_scheduler); - g_assert(!i->announcements); + assert(!i->announcements); - update_interface_rr(m, i, TRUE); + update_interface_rr(m, i, 1); while (i->addresses) free_address(m, i->addresses); @@ -150,31 +186,34 @@ static void free_interface(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean AVAHI_LLIST_REMOVE(AvahiInterface, interface, m->interfaces, i); AVAHI_LLIST_REMOVE(AvahiInterface, by_hardware, i->hardware->interfaces, i); - g_free(i); + avahi_free(i); } -static void free_hw_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, gboolean send_goodbye) { - g_assert(m); - g_assert(hw); +static void free_hw_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, int send_goodbye) { + assert(m); + assert(hw); - update_hw_interface_rr(m, hw, TRUE); + update_hw_interface_rr(m, hw, 1); while (hw->interfaces) free_interface(m, hw->interfaces, send_goodbye); + if (hw->entry_group) + avahi_s_entry_group_free(hw->entry_group); + AVAHI_LLIST_REMOVE(AvahiHwInterface, hardware, m->hw_interfaces, hw); - g_hash_table_remove(m->hash_table, &hw->index); + avahi_hashmap_remove(m->hashmap, &hw->index); - g_free(hw->name); - g_free(hw); + avahi_free(hw->name); + avahi_free(hw); } static AvahiInterfaceAddress* get_address(AvahiInterfaceMonitor *m, AvahiInterface *i, const AvahiAddress *raddr) { AvahiInterfaceAddress *ia; - g_assert(m); - g_assert(i); - g_assert(raddr); + assert(m); + assert(i); + assert(raddr); for (ia = i->addresses; ia; ia = ia->address_next) if (avahi_address_cmp(&ia->address, raddr) == 0) @@ -183,10 +222,10 @@ static AvahiInterfaceAddress* get_address(AvahiInterfaceMonitor *m, AvahiInterfa return NULL; } -static int netlink_list_items(AvahiNetlink *nl, guint16 type, guint *ret_seq) { +static int netlink_list_items(AvahiNetlink *nl, uint16_t type, unsigned *ret_seq) { struct nlmsghdr *n; struct rtgenmsg *gen; - guint8 req[1024]; + uint8_t req[1024]; memset(&req, 0, sizeof(req)); n = (struct nlmsghdr*) req; @@ -202,18 +241,20 @@ static int netlink_list_items(AvahiNetlink *nl, guint16 type, guint *ret_seq) { return avahi_netlink_send(nl, n, ret_seq); } -static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, guchar protocol) { +static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, AvahiProtocol protocol) { AvahiInterface *i; - g_assert(m); - g_assert(hw); - g_assert(protocol != AF_UNSPEC); + assert(m); + assert(hw); + assert(protocol != AVAHI_PROTO_UNSPEC); - i = g_new(AvahiInterface, 1); + if (!(i = avahi_new(AvahiInterface, 1))) + goto fail; /* OOM */ + i->monitor = m; i->hardware = hw; i->protocol = protocol; - i->announcing = FALSE; + i->announcing = 0; AVAHI_LLIST_HEAD_INIT(AvahiInterfaceAddress, i->addresses); AVAHI_LLIST_HEAD_INIT(AvahiAnnouncement, i->announcements); @@ -223,92 +264,113 @@ static void new_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, guchar i->query_scheduler = avahi_query_scheduler_new(i); i->probe_scheduler = avahi_probe_scheduler_new(i); + if (!i->cache || !i->response_scheduler || !i->query_scheduler || !i->probe_scheduler) + goto fail; /* OOM */ + AVAHI_LLIST_PREPEND(AvahiInterface, by_hardware, hw->interfaces, i); AVAHI_LLIST_PREPEND(AvahiInterface, interface, m->interfaces, i); + + return; +fail: + + if (i) { + if (i->cache) + avahi_cache_free(i->cache); + if (i->response_scheduler) + avahi_response_scheduler_free(i->response_scheduler); + if (i->query_scheduler) + avahi_query_scheduler_free(i->query_scheduler); + if (i->probe_scheduler) + avahi_probe_scheduler_free(i->probe_scheduler); + } + } static void check_interface_relevant(AvahiInterfaceMonitor *m, AvahiInterface *i) { - gboolean b; + int b; - g_assert(m); - g_assert(i); + assert(m); + assert(i); b = avahi_interface_relevant(i); if (b && !i->announcing) { avahi_log_debug("New relevant interface %s.%i (#%i)", i->hardware->name, i->protocol, i->hardware->index); - if (i->protocol == AF_INET) - avahi_mdns_mcast_join_ipv4(i->hardware->index, m->server->fd_ipv4); - if (i->protocol == AF_INET6) - avahi_mdns_mcast_join_ipv6(i->hardware->index, m->server->fd_ipv6); + if (i->protocol == AVAHI_PROTO_INET) + avahi_mdns_mcast_join_ipv4(m->server->fd_ipv4, i->hardware->index); + if (i->protocol == AVAHI_PROTO_INET6) + avahi_mdns_mcast_join_ipv6(m->server->fd_ipv6, i->hardware->index); - i->announcing = TRUE; + i->announcing = 1; avahi_announce_interface(m->server, i); avahi_browser_new_interface(m->server, i); } else if (!b && i->announcing) { avahi_log_debug("Interface %s.%i no longer relevant", i->hardware->name, i->protocol); - if (i->protocol == AF_INET) - avahi_mdns_mcast_leave_ipv4(i->hardware->index, m->server->fd_ipv4); - if (i->protocol == AF_INET6) - avahi_mdns_mcast_leave_ipv6(i->hardware->index, m->server->fd_ipv6); + if (i->protocol == AVAHI_PROTO_INET) + avahi_mdns_mcast_leave_ipv4(m->server->fd_ipv4, i->hardware->index); + if (i->protocol == AVAHI_PROTO_INET6) + avahi_mdns_mcast_leave_ipv6(m->server->fd_ipv6, i->hardware->index); - avahi_goodbye_interface(m->server, i, FALSE); + avahi_goodbye_interface(m->server, i, 0); avahi_response_scheduler_clear(i->response_scheduler); avahi_query_scheduler_clear(i->query_scheduler); avahi_probe_scheduler_clear(i->probe_scheduler); avahi_cache_flush(i->cache); - i->announcing = FALSE; + i->announcing = 0; } } static void check_hw_interface_relevant(AvahiInterfaceMonitor *m, AvahiHwInterface *hw) { AvahiInterface *i; - g_assert(m); - g_assert(hw); + assert(m); + assert(hw); for (i = hw->interfaces; i; i = i->by_hardware_next) check_interface_relevant(m, i); } -static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { +static void netlink_callback(AvahiNetlink *nl, struct nlmsghdr *n, void* userdata) { AvahiInterfaceMonitor *m = userdata; - g_assert(m); - g_assert(n); - g_assert(m->netlink == nl); + assert(m); + assert(n); + assert(m->netlink == nl); if (n->nlmsg_type == RTM_NEWLINK) { struct ifinfomsg *ifinfomsg = NLMSG_DATA(n); AvahiHwInterface *hw; struct rtattr *a = NULL; size_t l; - + if (ifinfomsg->ifi_family != AF_UNSPEC) return; - if (!(hw = g_hash_table_lookup(m->hash_table, &ifinfomsg->ifi_index))) { - hw = g_new(AvahiHwInterface, 1); + if (!(hw = avahi_hashmap_lookup(m->hashmap, &ifinfomsg->ifi_index))) { + + if (!(hw = avahi_new(AvahiHwInterface, 1))) + return; /* OOM */ + hw->monitor = m; hw->name = NULL; hw->flags = 0; hw->mtu = 1500; - hw->index = ifinfomsg->ifi_index; + hw->index = (AvahiIfIndex) ifinfomsg->ifi_index; hw->mac_address_size = 0; hw->entry_group = NULL; AVAHI_LLIST_HEAD_INIT(AvahiInterface, hw->interfaces); AVAHI_LLIST_PREPEND(AvahiHwInterface, hardware, m->hw_interfaces, hw); - g_hash_table_insert(m->hash_table, &hw->index, hw); + avahi_hashmap_insert(m->hashmap, &hw->index, hw); if (m->server->fd_ipv4 >= 0) - new_interface(m, hw, AF_INET); + new_interface(m, hw, AVAHI_PROTO_INET); if (m->server->fd_ipv6 >= 0) - new_interface(m, hw, AF_INET6); + new_interface(m, hw, AVAHI_PROTO_INET6); } hw->flags = ifinfomsg->ifi_flags; @@ -319,12 +381,12 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { while (RTA_OK(a, l)) { switch(a->rta_type) { case IFLA_IFNAME: - g_free(hw->name); - hw->name = g_strndup(RTA_DATA(a), RTA_PAYLOAD(a)); + avahi_free(hw->name); + hw->name = avahi_strndup(RTA_DATA(a), RTA_PAYLOAD(a)); break; case IFLA_MTU: - g_assert(RTA_PAYLOAD(a) == sizeof(unsigned int)); + assert(RTA_PAYLOAD(a) == sizeof(unsigned int)); hw->mtu = *((unsigned int*) RTA_DATA(a)); break; @@ -344,7 +406,7 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { a = RTA_NEXT(a, l); } - update_hw_interface_rr(m, hw, FALSE); + update_hw_interface_rr(m, hw, 0); check_hw_interface_relevant(m, hw); } else if (n->nlmsg_type == RTM_DELLINK) { @@ -354,11 +416,11 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { if (ifinfomsg->ifi_family != AF_UNSPEC) return; - if (!(hw = avahi_interface_monitor_get_hw_interface(m, ifinfomsg->ifi_index))) + if (!(hw = avahi_interface_monitor_get_hw_interface(m, (AvahiIfIndex) ifinfomsg->ifi_index))) return; - update_hw_interface_rr(m, hw, TRUE); - free_hw_interface(m, hw, FALSE); + update_hw_interface_rr(m, hw, 1); + free_hw_interface(m, hw, 0); } else if (n->nlmsg_type == RTM_NEWADDR || n->nlmsg_type == RTM_DELADDR) { @@ -367,15 +429,15 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { struct rtattr *a = NULL; size_t l; AvahiAddress raddr; - gboolean raddr_valid = FALSE; + int raddr_valid = 0; - if (ifaddrmsg->ifa_family != AF_INET && ifaddrmsg->ifa_family != AF_INET6) + if (ifaddrmsg->ifa_family != AVAHI_PROTO_INET && ifaddrmsg->ifa_family != AVAHI_PROTO_INET6) return; - if (!(i = (AvahiInterface*) avahi_interface_monitor_get_interface(m, ifaddrmsg->ifa_index, ifaddrmsg->ifa_family))) + if (!(i = (AvahiInterface*) avahi_interface_monitor_get_interface(m, (AvahiIfIndex) ifaddrmsg->ifa_index, (AvahiProtocol) ifaddrmsg->ifa_family))) return; - raddr.family = ifaddrmsg->ifa_family; + raddr.family = (AvahiProtocol) ifaddrmsg->ifa_family; l = NLMSG_PAYLOAD(n, sizeof(struct ifaddrmsg)); a = IFA_RTA(ifaddrmsg); @@ -384,15 +446,15 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { switch(a->rta_type) { case IFA_ADDRESS: - if ((raddr.family == AF_INET6 && RTA_PAYLOAD(a) != 16) || - (raddr.family == AF_INET && RTA_PAYLOAD(a) != 4)) + if ((raddr.family == AVAHI_PROTO_INET6 && RTA_PAYLOAD(a) != 16) || + (raddr.family == AVAHI_PROTO_INET && RTA_PAYLOAD(a) != 4)) return; memcpy(raddr.data.data, RTA_DATA(a), RTA_PAYLOAD(a)); - raddr_valid = TRUE; + raddr_valid = 1; break; - + default: ; } @@ -407,7 +469,9 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { AvahiInterfaceAddress *addr; if (!(addr = get_address(m, i, &raddr))) { - addr = g_new(AvahiInterfaceAddress, 1); + if (!(addr = avahi_new(AvahiInterfaceAddress, 1))) + return; /* OOM */ + addr->monitor = m; addr->address = raddr; addr->interface = i; @@ -418,21 +482,21 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { addr->flags = ifaddrmsg->ifa_flags; addr->scope = ifaddrmsg->ifa_scope; + addr->prefix_len = ifaddrmsg->ifa_prefixlen; - update_address_rr(m, addr, FALSE); - check_interface_relevant(m, i); + update_address_rr(m, addr, 0); } else { AvahiInterfaceAddress *addr; if (!(addr = get_address(m, i, &raddr))) return; - update_address_rr(m, addr, TRUE); + update_address_rr(m, addr, 1); free_address(m, addr); - - check_interface_relevant(m, i); } - + + check_interface_relevant(m, i); + } else if (n->nlmsg_type == NLMSG_DONE) { if (m->list == LIST_IFACE) { @@ -444,7 +508,7 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { m->list = LIST_ADDR; } else { m->list = LIST_DONE; - avahi_log_debug("Enumeration complete"); + avahi_log_debug("Network interface enumeration completed"); } } else if (n->nlmsg_type == NLMSG_ERROR && (n->nlmsg_seq == m->query_link_seq || n->nlmsg_seq == m->query_addr_seq)) { @@ -458,12 +522,14 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) { AvahiInterfaceMonitor *avahi_interface_monitor_new(AvahiServer *s) { AvahiInterfaceMonitor *m = NULL; - m = g_new0(AvahiInterfaceMonitor, 1); + if (!(m = avahi_new0(AvahiInterfaceMonitor, 1))) + return NULL; /* OOM */ + m->server = s; - if (!(m->netlink = avahi_netlink_new(s->context, G_PRIORITY_DEFAULT-10, RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR, callback, m))) + if (!(m->netlink = avahi_netlink_new(s->poll_api, RTMGRP_LINK|RTMGRP_IPV4_IFADDR|RTMGRP_IPV6_IFADDR, netlink_callback, m))) goto fail; - m->hash_table = g_hash_table_new(g_int_hash, g_int_equal); + m->hashmap = avahi_hashmap_new(avahi_int_hash, avahi_int_equal, NULL, NULL); AVAHI_LLIST_HEAD_INIT(AvahiInterface, m->interfaces); AVAHI_LLIST_HEAD_INIT(AvahiHwInterface, m->hw_interfaces); @@ -481,42 +547,42 @@ fail: } void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m) { - g_assert(m); + assert(m); while (m->list != LIST_DONE) { - if (!avahi_netlink_work(m->netlink, TRUE)) + if (!avahi_netlink_work(m->netlink, 1)) break; } } void avahi_interface_monitor_free(AvahiInterfaceMonitor *m) { - g_assert(m); + assert(m); while (m->hw_interfaces) - free_hw_interface(m, m->hw_interfaces, TRUE); + free_hw_interface(m, m->hw_interfaces, 1); - g_assert(!m->interfaces); + assert(!m->interfaces); if (m->netlink) avahi_netlink_free(m->netlink); - if (m->hash_table) - g_hash_table_destroy(m->hash_table); + if (m->hashmap) + avahi_hashmap_free(m->hashmap); - g_free(m); + avahi_free(m); } -AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, gint index, guchar protocol) { +AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol) { AvahiHwInterface *hw; AvahiInterface *i; - g_assert(m); - g_assert(index > 0); - g_assert(protocol != AF_UNSPEC); + assert(m); + assert(idx > 0); + assert(protocol != AVAHI_PROTO_UNSPEC); - if (!(hw = avahi_interface_monitor_get_hw_interface(m, index))) + if (!(hw = avahi_interface_monitor_get_hw_interface(m, idx))) return NULL; for (i = hw->interfaces; i; i = i->by_hardware_next) @@ -526,96 +592,99 @@ AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, return NULL; } -AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index) { - g_assert(m); - g_assert(index > 0); +AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx) { + assert(m); + assert(idx > 0); - return g_hash_table_lookup(m->hash_table, &index); + return avahi_hashmap_lookup(m->hashmap, &idx); } - -void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port) { - g_assert(i); - g_assert(p); +void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, uint16_t port) { + assert(i); + assert(p); /* char t[64]; */ if (!avahi_interface_relevant(i)) return; - g_assert(!a || a->family == i->protocol); + assert(!a || a->family == i->protocol); /* if (a) */ /* avahi_log_debug("unicast sending on '%s.%i' to %s:%u", i->hardware->name, i->protocol, avahi_address_snprint(t, sizeof(t), a), port); */ /* else */ /* avahi_log_debug("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */ - if (i->protocol == AF_INET && i->monitor->server->fd_ipv4 >= 0) + if (i->protocol == AVAHI_PROTO_INET && i->monitor->server->fd_ipv4 >= 0) avahi_send_dns_packet_ipv4(i->monitor->server->fd_ipv4, i->hardware->index, p, a ? &a->data.ipv4 : NULL, port); - else if (i->protocol == AF_INET6 && i->monitor->server->fd_ipv6 >= 0) + else if (i->protocol == AVAHI_PROTO_INET6 && i->monitor->server->fd_ipv6 >= 0) avahi_send_dns_packet_ipv6(i->monitor->server->fd_ipv6, i->hardware->index, p, a ? &a->data.ipv6 : NULL, port); } void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p) { - g_assert(i); - g_assert(p); + assert(i); + assert(p); avahi_interface_send_packet_unicast(i, p, NULL, 0); } -gboolean avahi_interface_post_query(AvahiInterface *i, AvahiKey *key, gboolean immediately) { - g_assert(i); - g_assert(key); +int avahi_interface_post_query(AvahiInterface *i, AvahiKey *key, int immediately) { + assert(i); + assert(key); if (avahi_interface_relevant(i)) return avahi_query_scheduler_post(i->query_scheduler, key, immediately); - return FALSE; + return 0; } -gboolean avahi_interface_post_response(AvahiInterface *i, AvahiRecord *record, gboolean flush_cache, const AvahiAddress *querier, gboolean immediately) { - g_assert(i); - g_assert(record); +int avahi_interface_post_response(AvahiInterface *i, AvahiRecord *record, int flush_cache, const AvahiAddress *querier, int immediately) { + assert(i); + assert(record); if (avahi_interface_relevant(i)) return avahi_response_scheduler_post(i->response_scheduler, record, flush_cache, querier, immediately); - return FALSE; + return 0; } -gboolean avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *record, gboolean immediately) { - g_assert(i); - g_assert(record); +int avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *record, int immediately) { + assert(i); + assert(record); if (avahi_interface_relevant(i)) return avahi_probe_scheduler_post(i->probe_scheduler, record, immediately); - return FALSE; + return 0; } -void avahi_dump_caches(AvahiInterfaceMonitor *m, FILE *f) { +int avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, void* userdata) { AvahiInterface *i; - g_assert(m); + assert(m); for (i = m->interfaces; i; i = i->interface_next) { if (avahi_interface_relevant(i)) { - fprintf(f, "\n;;; INTERFACE %s.%i ;;;\n", i->hardware->name, i->protocol); - avahi_cache_dump(i->cache, f); + char ln[256]; + snprintf(ln, sizeof(ln), ";;; INTERFACE %s.%i ;;;", i->hardware->name, i->protocol); + callback(ln, userdata); + if (avahi_cache_dump(i->cache, callback, userdata) < 0) + return -1; } } - fprintf(f, "\n"); + + return 0; } -gboolean avahi_interface_relevant(AvahiInterface *i) { +int avahi_interface_relevant(AvahiInterface *i) { AvahiInterfaceAddress *a; - gboolean relevant_address; + int relevant_address; - g_assert(i); + assert(i); - relevant_address = FALSE; + relevant_address = 0; for (a = i->addresses; a; a = a->address_next) if (avahi_interface_address_relevant(a)) { - relevant_address = TRUE; + relevant_address = 1; break; } @@ -635,31 +704,31 @@ gboolean avahi_interface_relevant(AvahiInterface *i) { relevant_address; } -gboolean avahi_interface_address_relevant(AvahiInterfaceAddress *a) { - g_assert(a); +int avahi_interface_address_relevant(AvahiInterfaceAddress *a) { + assert(a); return a->scope == RT_SCOPE_UNIVERSE; } -gboolean avahi_interface_match(AvahiInterface *i, gint index, guchar protocol) { - g_assert(i); +int avahi_interface_match(AvahiInterface *i, AvahiIfIndex idx, AvahiProtocol protocol) { + assert(i); - if (index > 0 && index != i->hardware->index) - return FALSE; + if (idx > 0 && idx != i->hardware->index) + return 0; - if (protocol != AF_UNSPEC && protocol != i->protocol) - return FALSE; + if (protocol != AVAHI_PROTO_UNSPEC && protocol != i->protocol) + return 0; - return TRUE; + return 1; } -void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guchar protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata) { - g_assert(m); - g_assert(callback); +void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex interface, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, void* userdata) { + assert(m); + assert(callback); if (interface > 0) { - if (protocol != AF_UNSPEC) { + if (protocol != AVAHI_PROTO_UNSPEC) { AvahiInterface *i; if ((i = avahi_interface_monitor_get_interface(m, interface, protocol))) @@ -684,25 +753,73 @@ void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guch } } -void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove) { +void avahi_update_host_rrs(AvahiInterfaceMonitor *m, int remove_rrs) { AvahiHwInterface *hw; - g_assert(m); + assert(m); for (hw = m->hw_interfaces; hw; hw = hw->hardware_next) - update_hw_interface_rr(m, hw, remove); + update_hw_interface_rr(m, hw, remove_rrs); } -gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a) { +int avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a) { AvahiInterface *i; AvahiInterfaceAddress *ia; - g_assert(m); - g_assert(a); + assert(m); + assert(a); for (i = m->interfaces; i; i = i->interface_next) for (ia = i->addresses; ia; ia = ia->address_next) if (avahi_address_cmp(a, &ia->address) == 0) - return TRUE; + return 1; + + return 0; +} + +int avahi_interface_address_on_link(AvahiInterface *i, const AvahiAddress *a) { + AvahiInterfaceAddress *ia; + + assert(i); + assert(a); + + if (a->family != i->protocol) + return 0; + + for (ia = i->addresses; ia; ia = ia->address_next) { + + if (a->family == AVAHI_PROTO_INET) { + uint32_t m; + + m = ~(((uint32_t) -1) >> ia->prefix_len); + + if ((ntohl(a->data.ipv4.address) & m) == (ntohl(ia->address.data.ipv4.address) & m)) + return 1; + } else { + unsigned j; + unsigned char pl; + assert(a->family == AVAHI_PROTO_INET6); + + pl = ia->prefix_len; + + for (j = 0; j < 16; j++) { + uint8_t m; + + if (pl == 0) + return 1; + + if (pl >= 8) { + m = 0xFF; + pl -= 8; + } else { + m = ~(0xFF >> pl); + pl = 0; + } + + if ((a->data.ipv6.address[j] & m) != (ia->address.data.ipv6.address[j] & m)) + break; + } + } + } - return FALSE; + return 0; }