some autoconf fixes

[catta] / avahi-core / iface.h

diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index 1372e6fd137ffcf7d13e3b42bd217813325590ae..c5c3c6117d21a92a13b8e0772b7a759027f7aa84 100644 (file)
--- 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,8 +112,8 @@ 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);
-AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index);
+AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol);
+AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint idx);
 
 void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p);
 void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port);
@@ -121,19 +122,22 @@ gboolean avahi_interface_post_query(AvahiInterface *i, AvahiKey *k, gboolean imm
 gboolean avahi_interface_post_response(AvahiInterface *i, AvahiRecord *record, gboolean flush_cache, const AvahiAddress *querier, gboolean immediately);
 gboolean avahi_interface_post_probe(AvahiInterface *i, AvahiRecord *p, gboolean immediately);
 
-void avahi_dump_caches(AvahiInterfaceMonitor *m, FILE *f);
+void avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, gpointer userdata);
 
 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 idx, 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 idx, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata);
 
-void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove);
+void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove_rrs);
 
 gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a);
 
+gboolean avahi_interface_address_on_link(AvahiInterface *i, const AvahiAddress *a);
+
+
 #endif