X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-discover-standalone%2Fmain.c;h=74dabd74b6070fd0af83cd4122036edaf9c487cc;hb=689381d4837bcf8a97bd51969d51096b3f2e2346;hp=8c917f81a29413d1ec9f83b37f6c388b0de511c8;hpb=8b4dca0af0dccc4223bc1b50a5ae5e55f9414184;p=catta diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c index 8c917f8..74dabd7 100644 --- a/avahi-discover-standalone/main.c +++ b/avahi-discover-standalone/main.c @@ -25,14 +25,20 @@ #include #include +#include #include #include #include #include + #include +#include + #include #include +#include + #include #include @@ -67,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; @@ -132,9 +110,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); @@ -145,13 +124,23 @@ static void free_service(struct Service *s) { g_free(s); } -static void service_browser_callback(AvahiSServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const gchar *service_name, const gchar *service_type, const gchar *domain_name, gpointer userdata) { +static void service_browser_callback( + AvahiSServiceBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *service_name, + const char *service_type, + const char *domain_name, + AvahiLookupResultFlags flags, + void* userdata) { if (event == AVAHI_BROWSER_NEW) { struct Service *s; 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); @@ -166,7 +155,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), "%s %s", getifname(interface), protocol == AF_INET ? "IPv4" : "IPv6"); + 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); @@ -187,7 +176,16 @@ static void service_browser_callback(AvahiSServiceBrowser *b, AvahiIfIndex inter } } -static void service_type_browser_callback(AvahiSServiceTypeBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const gchar *service_type, const gchar *domain, gpointer userdata) { +static void service_type_browser_callback( + AvahiSServiceTypeBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + const char *service_type, + const char *domain, + AvahiLookupResultFlags flags, + void * userdata) { + struct ServiceType *st; GtkTreePath *path; GtkTreeIter iter; @@ -211,14 +209,15 @@ static void service_type_browser_callback(AvahiSServiceTypeBrowser *b, AvahiIfIn g_hash_table_insert(service_type_hash_table, st->service_type, st); - st->browser = avahi_s_service_browser_new(server, -1, AF_UNSPEC, st->service_type, domain, service_browser_callback, NULL); + st->browser = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, st->service_type, domain, 0, service_browser_callback, NULL); } 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[256]; + char na[AVAHI_ADDRESS_STR_MAX]; avahi_address_snprint(na, sizeof(na), a); snprintf(address, sizeof(address), "%s/%s:%u", hostname, na, port); @@ -241,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), s->protocol == AF_INET ? "IPv4" : "IPv6", + if_indextoname(s->interface,name), avahi_proto_to_string(s->protocol), address, txt_s); @@ -256,6 +255,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); @@ -263,8 +266,21 @@ static struct Service *get_service_on_cursor(void) { return s; } - -static void service_resolver_callback(AvahiSServiceResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, const gchar *name, const gchar *type, const gchar *domain, const gchar *host_name, const AvahiAddress *a, guint16 port, AvahiStringList *txt, gpointer userdata) { +static void service_resolver_callback( + AvahiSServiceResolver *r, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, + const char *type, + const char *domain, + const char *host_name, + const AvahiAddress *a, + uint16_t port, + AvahiStringList *txt, + AvahiLookupResultFlags flags, + void* userdata) { + struct Service *s; g_assert(r); @@ -275,9 +291,11 @@ static void service_resolver_callback(AvahiSServiceResolver *r, AvahiIfIndex int return; } - if (event == AVAHI_RESOLVER_TIMEOUT) - gtk_label_set_markup(info_label, "Failed to resolve."); - else + if (event == AVAHI_RESOLVER_FAILURE) { + char t[256]; + snprintf(t, sizeof(t), "Failed to resolve: %s.", avahi_strerror(avahi_server_errno(server))); + gtk_label_set_markup(info_label, t); + } else if (event == AVAHI_RESOLVER_FOUND) update_label(s, host_name, a, port, txt); } @@ -292,7 +310,7 @@ static void tree_view_on_cursor_changed(GtkTreeView *tv, gpointer userdata) { update_label(s, NULL, NULL, 0, NULL); - service_resolver = avahi_s_service_resolver_new(server, s->interface, s->protocol, s->service_name, s->service_type->service_type, s->domain_name, AF_UNSPEC, service_resolver_callback, s); + service_resolver = avahi_s_service_resolver_new(server, s->interface, s->protocol, s->service_name, s->service_type->service_type, s->domain_name, AVAHI_PROTO_UNSPEC, 0, service_resolver_callback, s); } static gboolean main_window_on_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) { @@ -341,7 +359,7 @@ int main(int argc, char *argv[]) { g_assert(server); - service_type_browser = avahi_s_service_type_browser_new(server, -1, AF_UNSPEC, argc >= 2 ? argv[1] : NULL, service_type_browser_callback, NULL); + service_type_browser = avahi_s_service_type_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, argc >= 2 ? argv[1] : NULL, 0, service_type_browser_callback, NULL); gtk_main();