X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-discover-standalone%2Fmain.c;h=2f000a45348526d7cfb12646fa1e2adfd5ab784f;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=bfc270d9e28a9a4a1b2fdf7a1c3e391cda3818e7;hpb=3adbda2cd5be48b7c630325f0f92e315d7eb2cfb;p=catta diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c index bfc270d..2f000a4 100644 --- a/avahi-discover-standalone/main.c +++ b/avahi-discover-standalone/main.c @@ -1,18 +1,16 @@ -/* $Id$ */ - /*** This file is part of avahi. - + avahi is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + avahi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with avahi; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -25,11 +23,12 @@ #include #include +#include +#include #include #include #include -#include #include #include @@ -72,34 +71,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; @@ -109,7 +80,7 @@ static struct Service *get_service(const gchar *service_type, const gchar *servi for (l = st->services; l; l = l->next) { struct Service *s = l->data; - + if (s->interface == interface && s->protocol == protocol && avahi_domain_equal(s->service_name, service_name) && @@ -131,17 +102,17 @@ static void free_service(struct Service *s) { avahi_s_service_resolver_free(service_resolver); service_resolver = NULL; } - + gtk_label_set_text(info_label, "Service removed"); } - + s->service_type->services = g_list_remove(s->service_type->services, s); 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); gtk_tree_row_reference_free(s->tree_ref); @@ -152,22 +123,23 @@ static void free_service(struct Service *s) { } static void service_browser_callback( - AvahiSServiceBrowser *b, + AVAHI_GCC_UNUSED AvahiSServiceBrowser *b, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *service_name, const char *service_type, const char *domain_name, - AvahiLookupResultFlags flags, - void* userdata) { + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED 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); s->domain_name = g_strdup(domain_name); @@ -175,13 +147,13 @@ static void service_browser_callback( s->protocol = protocol; s->service_type = g_hash_table_lookup(service_type_hash_table, service_type); g_assert(s->service_type); - + s->service_type->services = g_list_prepend(s->service_type->services, s); 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); @@ -193,7 +165,7 @@ static void service_browser_callback( gtk_tree_view_expand_row(tree_view, ppath, FALSE); gtk_tree_path_free(ppath); - + } else if (event == AVAHI_BROWSER_REMOVE) { struct Service* s; @@ -203,15 +175,15 @@ static void service_browser_callback( } static void service_type_browser_callback( - AvahiSServiceTypeBrowser *b, - AvahiIfIndex interface, - AvahiProtocol protocol, + AVAHI_GCC_UNUSED AvahiSServiceTypeBrowser *b, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiBrowserEvent event, const char *service_type, const char *domain, - AvahiLookupResultFlags flags, - void * userdata) { - + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED void * userdata) { + struct ServiceType *st; GtkTreePath *path; GtkTreeIter iter; @@ -225,7 +197,7 @@ static void service_type_browser_callback( st = g_new(struct ServiceType, 1); st->service_type = g_strdup(service_type); st->services = NULL; - + gtk_tree_store_append(tree_store, &iter, NULL); gtk_tree_store_set(tree_store, &iter, 0, st->service_type, 1, "", 2, NULL, -1); @@ -240,6 +212,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]; @@ -254,7 +227,7 @@ static void update_label(struct Service *s, const gchar *hostname, const AvahiAd snprintf(address, sizeof(address), "n/a"); txt_s = g_strdup("n/a"); } - + snprintf(t, sizeof(t), "Service Type: %s\n" "Service Name: %s\n" @@ -265,7 +238,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); @@ -278,12 +251,12 @@ static struct Service *get_service_on_cursor(void) { GtkTreePath *path; struct Service *s; 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); @@ -293,19 +266,19 @@ static struct Service *get_service_on_cursor(void) { static void service_resolver_callback( AvahiSServiceResolver *r, - AvahiIfIndex interface, - AvahiProtocol protocol, + AVAHI_GCC_UNUSED AvahiIfIndex interface, + AVAHI_GCC_UNUSED AvahiProtocol protocol, AvahiResolverEvent event, - const char *name, - const char *type, - const char *domain, + AVAHI_GCC_UNUSED const char *name, + AVAHI_GCC_UNUSED const char *type, + AVAHI_GCC_UNUSED const char *domain, const char *host_name, const AvahiAddress *a, uint16_t port, AvahiStringList *txt, - AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata) { - + struct Service *s; g_assert(r); @@ -324,9 +297,9 @@ static void service_resolver_callback( update_label(s, host_name, a, port, txt); } -static void tree_view_on_cursor_changed(GtkTreeView *tv, gpointer userdata) { +static void tree_view_on_cursor_changed(AVAHI_GCC_UNUSED GtkTreeView *tv, AVAHI_GCC_UNUSED gpointer userdata) { struct Service *s; - + if (!(s = get_service_on_cursor())) return; @@ -338,33 +311,33 @@ static void tree_view_on_cursor_changed(GtkTreeView *tv, gpointer userdata) { 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) { +static gboolean main_window_on_delete_event(AVAHI_GCC_UNUSED GtkWidget *widget, AVAHI_GCC_UNUSED GdkEvent *event, AVAHI_GCC_UNUSED gpointer user_data) { gtk_main_quit(); return FALSE; } int main(int argc, char *argv[]) { - GladeXML *xml; + GtkBuilder *ui; AvahiServerConfig config; GtkTreeViewColumn *c; gint error; AvahiGLibPoll *poll_api; gtk_init(&argc, &argv); - glade_init(); avahi_set_allocator(avahi_glib_allocator()); poll_api = avahi_glib_poll_new(NULL, G_PRIORITY_DEFAULT); - xml = glade_xml_new(AVAHI_INTERFACES_DIR"avahi-discover.glade", NULL, NULL); - main_window = glade_xml_get_widget(xml, "main_window"); + ui = gtk_builder_new(); + gtk_builder_add_from_file(ui, AVAHI_INTERFACES_DIR"avahi-discover.ui", NULL); + main_window = GTK_WIDGET(gtk_builder_get_object(ui, "main_window")); g_signal_connect(main_window, "delete-event", (GCallback) main_window_on_delete_event, NULL); - - tree_view = GTK_TREE_VIEW(glade_xml_get_widget(xml, "tree_view")); + + tree_view = GTK_TREE_VIEW(gtk_builder_get_object(ui, "tree_view")); g_signal_connect(GTK_WIDGET(tree_view), "cursor-changed", (GCallback) tree_view_on_cursor_changed, NULL); - info_label = GTK_LABEL(glade_xml_get_widget(xml, "info_label")); + info_label = GTK_LABEL(gtk_builder_get_object(ui, "info_label")); tree_store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER); gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(tree_store)); @@ -374,9 +347,9 @@ int main(int argc, char *argv[]) { gtk_tree_view_column_set_resizable(c = gtk_tree_view_get_column(tree_view, 0), TRUE); gtk_tree_view_column_set_sizing(c, GTK_TREE_VIEW_COLUMN_GROW_ONLY); gtk_tree_view_column_set_expand(c, TRUE); - + service_type_hash_table = g_hash_table_new((GHashFunc) avahi_domain_hash, (GEqualFunc) avahi_domain_equal); - + avahi_server_config_init(&config); config.publish_hinfo = config.publish_addresses = config.publish_domain = config.publish_workstation = FALSE; server = avahi_server_new(avahi_glib_poll_get(poll_api), &config, NULL, NULL, &error);