* Revert fix from R1398

 * avahi-core/iface.c#avahi_interface_monitor_get_hw_interface - Change assert to idx >= 0, this is the correct fix incase a platform has interface indexes starting from 0
 * Fix incorrect AVAHI_PROTO_UNSPEC to AVAHI_IF_UNSPEC

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1399 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-common/address.h b/avahi-common/address.h
index 7f10a55d4e8c5a89fa328c1c7f952250d03b6d98..b8706ee92b177323f9021056d87b4cf8f10eeebd 100644 (file)
--- a/avahi-common/address.h
+++ b/avahi-common/address.h
@@ -53,7 +53,7 @@ enum {
 #define AVAHI_ADDRESS_STR_MAX 40 /* IPv6 Max = 4*8 + 7 + 1 for NUL */
 
 /** Return TRUE if the specified interface index is valid */
-#define AVAHI_IF_VALID(ifindex) (((ifindex) > 0) || ((ifindex) == AVAHI_PROTO_UNSPEC))
+#define AVAHI_IF_VALID(ifindex) (((ifindex) >= 0) || ((ifindex) == AVAHI_IF_UNSPEC))
 
 /** Return TRUE if the specified protocol is valid */
 #define AVAHI_PROTO_VALID(protocol) (((protocol) == AVAHI_PROTO_INET) || ((protocol) == AVAHI_PROTO_INET6) || ((protocol) == AVAHI_PROTO_UNSPEC))

diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index 9fc8cb3293e69463e660eec82fb080c68635bfea..f90a61ada37627780dfcb63fb4dbc20528962844 100644 (file)
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -539,7 +539,7 @@ AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m,
 
 AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx) {
     assert(m);
-    assert(idx > 0);
+    assert(idx >= 0);
 
     return avahi_hashmap_lookup(m->hashmap, &idx);
 }