1 files changed, 9 insertions, 5 deletions
diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index 1372e6f..486207e 100644
--- a/avahi-core/iface.h
+++ b/avahi-core/iface.h
@@ -64,7 +64,7 @@ struct AvahiHwInterface {
     AvahiInterfaceMonitor *monitor;
 
     gchar *name;
-    gint index;
+    AvahiIfIndex index;
     guint flags;
     guint mtu;
 
@@ -82,7 +82,7 @@ struct AvahiInterface {
     AvahiInterfaceMonitor *monitor;
     
     AvahiHwInterface *hardware;
-    guchar protocol;
+    AvahiProtocol protocol;
     gboolean announcing;
 
     AvahiCache *cache;
@@ -100,6 +100,7 @@ struct AvahiInterfaceAddress {
     
     guchar flags;
     guchar scope;
+    guchar prefix_len;
     AvahiAddress address;
     
     AvahiEntryGroup *entry_group;
@@ -111,7 +112,7 @@ void avahi_interface_monitor_free(AvahiInterfaceMonitor *m);
 
 void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m);
 
-AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, gint index, guchar protocol);
+AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex index, AvahiProtocol protocol);
 AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index);
 
 void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p);
@@ -126,14 +127,17 @@ void avahi_dump_caches(AvahiInterfaceMonitor *m, FILE *f);
 gboolean avahi_interface_relevant(AvahiInterface *i);
 gboolean avahi_interface_address_relevant(AvahiInterfaceAddress *a);
 
-gboolean avahi_interface_match(AvahiInterface *i, gint index, guchar protocol);
+gboolean avahi_interface_match(AvahiInterface *i, AvahiIfIndex index, AvahiProtocol protocol);
 
 typedef void (*AvahiInterfaceMonitorWalkCallback)(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata);
     
-void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, gint index, guchar protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata);
+void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex index, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata);
 
 void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove);
 
 gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a);
 
+gboolean avahi_interface_address_on_link(AvahiInterface *i, const AvahiAddress *a);
+
+
 #endif