#include <sys/ioctl.h>
#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <net/if.h>
#include <unistd.h>
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;
}
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);
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);
}
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;
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);
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);
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;
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()))
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;
}