From 6474c4a0a75578090094a87be91bbccebcb56cd1 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Sat, 24 Mar 2007 11:41:03 +0000 Subject: * 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 --- avahi-common/address.h | 2 +- avahi-core/iface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/avahi-common/address.h b/avahi-common/address.h index 7f10a55..b8706ee 100644 --- 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 9fc8cb3..f90a61a 100644 --- 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); } -- cgit