X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Fiface.c;h=60419dff61803dd90a2183c756541b5a4747068f;hb=219241ab5223b705ade51485ea9227b0a6089c0d;hp=ff7106bf5d0d0e1ff57192ca6d1d9c4c084f2642;hpb=a29887070855153ac64a3503e2f0004c2056f8e8;p=catta

diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index ff7106b..60419df 100644
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -36,6 +36,8 @@
 #include "dns.h"
 #include "socket.h"
 #include "announce.h"
+#include "util.h"
+#include "log.h"
 
 static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a, gboolean remove) {
     g_assert(m);
@@ -43,14 +45,18 @@ static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a
 
     if (avahi_interface_address_relevant(a) &&
         !remove &&
-        m->server->config.register_addresses &&
+        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);
+            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.");
+                avahi_entry_group_free(a->entry_group);
+                a->entry_group = NULL;
+            } else
+                avahi_entry_group_commit(a->entry_group);
         }
     } else {
 
@@ -83,6 +89,40 @@ static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *h
 
     for (i = hw->interfaces; i; i = i->by_hardware_next)
         update_interface_rr(m, i, remove);
+
+    if (!remove &&
+        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);
+            if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AF_UNSPEC, "_workstation._tcp", name, NULL, NULL, 9, NULL) < 0) { 
+                avahi_log_warn(__FILE__": avahi_server_add_service() failed.");
+                avahi_entry_group_free(hw->entry_group);
+                hw->entry_group = NULL;
+            } else
+                avahi_entry_group_commit(hw->entry_group);
+
+            g_free(name);
+        }
+        
+    } else {
+
+        if (hw->entry_group) {
+
+            if (avahi_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;
+        }
+    }
 }
 
 static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) {
@@ -90,10 +130,8 @@ static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) {
     g_assert(a);
     g_assert(a->interface);
 
+    update_address_rr(m, a, TRUE);
     AVAHI_LLIST_REMOVE(AvahiInterfaceAddress, address, a->interface->addresses, a);
-
-    if (a->entry_group)
-        avahi_entry_group_free(a->entry_group);
     
     g_free(a);
 }
@@ -107,6 +145,8 @@ static void free_interface(AvahiInterfaceMonitor *m, AvahiInterface *i, gboolean
     
     g_assert(!i->announcements);
 
+    update_interface_rr(m, i, TRUE);
+    
     while (i->addresses)
         free_address(m, i->addresses);
 
@@ -125,6 +165,8 @@ static void free_hw_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, gb
     g_assert(m);
     g_assert(hw);
 
+    update_hw_interface_rr(m, hw, TRUE);
+    
     while (hw->interfaces)
         free_interface(m, hw->interfaces, send_goodbye);
 
@@ -202,7 +244,7 @@ static void check_interface_relevant(AvahiInterfaceMonitor *m, AvahiInterface *i
     b = avahi_interface_relevant(i);
 
     if (b && !i->announcing) {
-        g_message("New relevant interface %s.%i (#%i)", i->hardware->name, i->protocol, i->hardware->index);
+        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);
@@ -211,8 +253,9 @@ static void check_interface_relevant(AvahiInterfaceMonitor *m, AvahiInterface *i
 
         i->announcing = TRUE;
         avahi_announce_interface(m->server, i);
+        avahi_browser_new_interface(m->server, i);
     } else if (!b && i->announcing) {
-        g_message("Interface %s.%i no longer relevant", i->hardware->name, i->protocol);
+        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);
@@ -262,6 +305,8 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) {
             hw->flags = 0;
             hw->mtu = 1500;
             hw->index = 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);
@@ -290,6 +335,15 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) {
                     g_assert(RTA_PAYLOAD(a) == sizeof(unsigned int));
                     hw->mtu = *((unsigned int*) RTA_DATA(a));
                     break;
+
+                case IFLA_ADDRESS: {
+                    hw->mac_address_size = RTA_PAYLOAD(a);
+                    if (hw->mac_address_size > AVAHI_MAX_MAC_ADDRESS)
+                        hw->mac_address_size = AVAHI_MAX_MAC_ADDRESS;
+                    
+                    memcpy(hw->mac_address, RTA_DATA(a), hw->mac_address_size);
+                    break;
+                }
                     
                 default:
                     ;
@@ -393,19 +447,19 @@ static void callback(AvahiNetlink *nl, struct nlmsghdr *n, gpointer userdata) {
             m->list = LIST_DONE;
             
             if (netlink_list_items(m->netlink, RTM_GETADDR, &m->query_addr_seq) < 0)
-                g_warning("NETLINK: Failed to list addrs: %s", strerror(errno));
+                avahi_log_warn("NETLINK: Failed to list addrs: %s", strerror(errno));
             else
                 m->list = LIST_ADDR;
         } else {
             m->list = LIST_DONE;
-            g_message("Enumeration complete");
+            avahi_log_debug("Enumeration complete");
         }
         
     } else if (n->nlmsg_type == NLMSG_ERROR && (n->nlmsg_seq == m->query_link_seq || n->nlmsg_seq == m->query_addr_seq)) {
         struct nlmsgerr *e = NLMSG_DATA (n);
                     
         if (e->error)
-            g_warning("NETLINK: Failed to browse: %s", strerror(-e->error));
+            avahi_log_warn("NETLINK: Failed to browse: %s", strerror(-e->error));
     }
 }
 
@@ -499,9 +553,9 @@ void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, c
     g_assert(!a || a->family == i->protocol);
 
 /*     if (a) */
-/*         g_message("unicast sending on '%s.%i' to %s:%u", i->hardware->name, i->protocol, avahi_address_snprint(t, sizeof(t), a), port); */
+/*         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 */
-/*         g_message("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
+/*         avahi_log_debug("multicast sending on '%s.%i'", i->hardware->name, i->protocol); */
     
     if (i->protocol == AF_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);
@@ -573,7 +627,7 @@ gboolean avahi_interface_relevant(AvahiInterface *i) {
             break;
         }
 
-/*     g_message("%p. iface-relevant: %i %i %i %i %i %i", i, relevant_address, */
+/*     avahi_log_debug("%p. iface-relevant: %i %i %i %i %i %i", i, relevant_address, */
 /*               (i->hardware->flags & IFF_UP), */
 /*               (i->hardware->flags & IFF_RUNNING), */
 /*               !(i->hardware->flags & IFF_LOOPBACK), */
@@ -639,10 +693,24 @@ void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint interface, guch
 }
 
 void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove) {
-    AvahiInterface *i;
+    AvahiHwInterface *hw;
+
+    g_assert(m);
 
+    for (hw = m->hw_interfaces; hw; hw = hw->hardware_next)
+        update_hw_interface_rr(m, hw, remove);
+}
+
+gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a) {
+    AvahiInterface *i;
+    AvahiInterfaceAddress *ia;
     g_assert(m);
+    g_assert(a);
 
     for (i = m->interfaces; i; i = i->interface_next)
-        update_interface_rr(m, i, remove);
+        for (ia = i->addresses; ia; ia = ia->address_next)
+            if (avahi_address_cmp(a, &ia->address) == 0)
+                return TRUE;
+
+    return FALSE;
 }