* Minor build change

[catta] / avahi-discover-standalone / main.c

diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c
index 6cd4cc457d7f38b1c70b1d4abbbe3ce57a226f23..a1aec1075fb04a60daffe903de5e3ac125271ce5 100644 (file)
--- a/avahi-discover-standalone/main.c
+++ b/avahi-discover-standalone/main.c
@@ -23,7 +23,10 @@
 #include <config.h>
 #endif
 
+#include <sys/ioctl.h>
 #include <string.h>
+#include <net/if.h>
+#include <unistd.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -64,6 +67,34 @@ static GHashTable *service_type_hash_table = NULL;
 static AvahiSServiceResolver *service_resolver = NULL;
 static struct Service *current_service = NULL;
 
+static const char* getifname(int idx) {
+    static char t[256];
+    static struct ifreq ifreq;
+    int fd = -1;
+
+    memset(&ifreq, 0, sizeof(ifreq));
+
+    if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
+        if ((fd = socket(PF_INET6, SOCK_DGRAM, 0)) < 0)
+            goto fail;
+    
+    ifreq.ifr_ifindex = idx;
+    if (ioctl(fd, SIOCGIFNAME, &ifreq) < 0)
+        goto fail;
+
+    close(fd);
+    
+    return ifreq.ifr_name;
+
+    
+fail:
+    if (fd >= 0)
+        close(fd);
+
+    snprintf(t, sizeof(t), "#%i", idx);
+    return t;
+}
+
 static struct Service *get_service(const gchar *service_type, const gchar *service_name, const gchar*domain_name, AvahiIfIndex interface, AvahiProtocol protocol) {
     struct ServiceType *st;
     GList *l;
@@ -101,9 +132,10 @@ static void free_service(struct Service *s) {
     
     s->service_type->services = g_list_remove(s->service_type->services, s);
 
-    path = gtk_tree_row_reference_get_path(s->tree_ref);
-    gtk_tree_model_get_iter(GTK_TREE_MODEL(tree_store), &iter, path);
-    gtk_tree_path_free(path);
+    if ((path = gtk_tree_row_reference_get_path(s->tree_ref))) {
+        gtk_tree_model_get_iter(GTK_TREE_MODEL(tree_store), &iter, path);
+        gtk_tree_path_free(path);
+    }
     
     gtk_tree_store_remove(tree_store, &iter);
 
@@ -135,7 +167,7 @@ static void service_browser_callback(AvahiSServiceBrowser *b, AvahiIfIndex inter
         ppath = gtk_tree_row_reference_get_path(s->service_type->tree_ref);
         gtk_tree_model_get_iter(GTK_TREE_MODEL(tree_store), &piter, ppath);
 
-        snprintf(iface, sizeof(iface), "#%i %s", interface, protocol == AF_INET ? "IPv4" : "IPv6");
+        snprintf(iface, sizeof(iface), "%s %s", getifname(interface), protocol == AF_INET ? "IPv4" : "IPv6");
 
         gtk_tree_store_append(tree_store, &iter, &piter);
         gtk_tree_store_set(tree_store, &iter, 0, s->service_name, 1, iface, 2, s, -1);
@@ -190,7 +222,11 @@ static void update_label(struct Service *s, const gchar *hostname, const AvahiAd
         char na[256];
         avahi_address_snprint(na, sizeof(na), a);
         snprintf(address, sizeof(address), "%s/%s:%u", hostname, na, port);
-        txt_s = avahi_string_list_to_string(txt);
+
+        if (txt)
+            txt_s = avahi_string_list_to_string(txt);
+        else
+            txt_s = g_strdup("<i>empty</i>");
     } else {
         snprintf(address, sizeof(address), "<i>n/a</i>");
         txt_s = g_strdup("<i>n/a</i>");
@@ -200,14 +236,13 @@ static void update_label(struct Service *s, const gchar *hostname, const AvahiAd
              "<b>Service Type:</b> %s\n"
              "<b>Service Name:</b> %s\n"
              "<b>Domain Name:</b> %s\n"
-             "<b>Interface:</b> %i %s\n"
+             "<b>Interface:</b> %s %s\n"
              "<b>Address:</b> %s\n"
              "<b>TXT Data:</b> %s",
              s->service_type->service_type,
              s->service_name,
              s->domain_name,
-             s->interface,
-             s->protocol == AF_INET ? "IPv4" : "IPv6",
+             getifname(s->interface), s->protocol == AF_INET ? "IPv4" : "IPv6",
              address,
              txt_s);
 
@@ -222,6 +257,10 @@ static struct Service *get_service_on_cursor(void) {
     GtkTreeIter iter;
     
     gtk_tree_view_get_cursor(tree_view, &path, NULL);
+
+    if (!path)
+        return NULL;
+    
     gtk_tree_model_get_iter(GTK_TREE_MODEL(tree_store), &iter, path);
     gtk_tree_model_get(GTK_TREE_MODEL(tree_store), &iter, 2, &s, -1);
     gtk_tree_path_free(path);
@@ -238,6 +277,7 @@ static void service_resolver_callback(AvahiSServiceResolver *r, AvahiIfIndex int
         g_assert(r == service_resolver);
         avahi_s_service_resolver_free(service_resolver);
         service_resolver = NULL;
+        return;
     }
 
     if (event == AVAHI_RESOLVER_TIMEOUT)