From 5e109a26f9905a8585f6b79e180b545a8d079dc6 Mon Sep 17 00:00:00 2001 From: Sebastien Estienne Date: Wed, 19 Oct 2005 20:31:51 +0000 Subject: * remove some --disable in boostrap.sh for osx * added a missing include in dus-protocol.h * remove getinterface in a-d-s replaced by if_indextoname * avahi-discover-standalone is now working on osx git-svn-id: file:///home/lennart/svn/public/avahi/trunk@826 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-discover-standalone/main.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'avahi-discover-standalone') diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c index bfc270d..74dabd7 100644 --- a/avahi-discover-standalone/main.c +++ b/avahi-discover-standalone/main.c @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -72,34 +73,6 @@ 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; @@ -167,6 +140,7 @@ static void service_browser_callback( GtkTreeIter iter, piter; GtkTreePath *path, *ppath; gchar iface[256]; + char name[IF_NAMESIZE]; s = g_new(struct Service, 1); s->service_name = g_strdup(service_name); @@ -181,7 +155,7 @@ static void service_browser_callback( 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), "%s %s", getifname(interface), avahi_proto_to_string(protocol)); + snprintf(iface, sizeof(iface), "%s %s", if_indextoname(interface, name), avahi_proto_to_string(protocol)); gtk_tree_store_append(tree_store, &iter, &piter); gtk_tree_store_set(tree_store, &iter, 0, s->service_name, 1, iface, 2, s, -1); @@ -240,6 +214,7 @@ static void service_type_browser_callback( static void update_label(struct Service *s, const gchar *hostname, const AvahiAddress *a, guint16 port, AvahiStringList *txt) { gchar t[512], address[64], *txt_s; + char name[IF_NAMESIZE]; if (a && hostname) { char na[AVAHI_ADDRESS_STR_MAX]; @@ -265,7 +240,7 @@ static void update_label(struct Service *s, const gchar *hostname, const AvahiAd s->service_type->service_type, s->service_name, s->domain_name, - getifname(s->interface), avahi_proto_to_string(s->protocol), + if_indextoname(s->interface,name), avahi_proto_to_string(s->protocol), address, txt_s); -- cgit