From 44b6e655482569ac677218e4e363f99f02e9df88 Mon Sep 17 00:00:00 2001
From: Thomas Ries <tries@gmx.net>
Date: Sun, 12 Jun 2011 17:53:48 +0000
Subject: [PATCH] - one-off in get_ip_by_ifname(), last interface in chain  
 was not considered in matching.

---
 ChangeLog   | 2 ++
 src/utils.c | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e64902a..fd2f976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 0.8.1
 =====
+  12-Jun-2011:  - one-off in get_ip_by_ifname(), last interface in chain
+                  was not considered in matching.
   11-Jun-2011:  - other stun server in example config file and
                   reworked some stun code.
   05-Jun-2011:  - readconf: allow spaces within string values.
diff --git a/src/utils.c b/src/utils.c
index 0ecb665..9be61dc 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -475,7 +475,7 @@ int get_ip_by_ifname(char *ifname, struct in_addr *retaddr) {
    }
 
    i=0; /* use "found" marker */
-   for (ifa = ifa_list; ifa->ifa_next; ifa = ifa->ifa_next) {
+   for (ifa = ifa_list; ifa != NULL; ifa = ifa->ifa_next) {
       DEBUGC(DBCLASS_BABBLE,"getifaddrs - %s / %s, ifa_addr=%p, addrfamily=%i",
              ifname, ifa->ifa_name,ifa->ifa_addr,
              (ifa->ifa_addr)?ifa->ifa_addr->sa_family:-1);
@@ -485,18 +485,14 @@ int get_ip_by_ifname(char *ifname, struct in_addr *retaddr) {
           strcmp(ifa->ifa_name, ifname) == 0) {
          /* found the entry */
          i=1;
-/*&&&*/DEBUGC(DBCLASS_BABBLE,"&&&1 ifname=0x%p",ifname);
          memcpy(&ifaddr, &((struct sockaddr_in*)ifa->ifa_addr)->sin_addr, sizeof(struct in_addr));
-/*&&&*/DEBUGC(DBCLASS_BABBLE,"&&&2 ifname=0x%p",ifname);
          ifflags=ifa->ifa_flags;
          DEBUGC(DBCLASS_BABBLE,"getifaddrs - MATCH, sin_addr=%s",
                 utils_inet_ntoa(ifaddr));
          break;
       }
    }
-/*&&&*/DEBUGC(DBCLASS_BABBLE,"&&&4 ifname=0x%p",ifname);
    freeifaddrs(ifa_list);
-/*&&&*/DEBUGC(DBCLASS_BABBLE,"&&&5 ifname=0x%p",ifname);
 
    if (i==0) {
       DEBUGC(DBCLASS_DNS,"Interface %s not found.", ifname);