Merged revisions 98390 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r98390 | russell | 2008-01-11 16:46:21 -0600 (Fri, 11 Jan 2008) | 9 lines

Fix up setting the EID on BSD based systems.

(closes issue #11646)
Reported by: caio1982
Patches:
      dundi_osx_eid6.diff.txt uploaded by caio1982 (license 22)
      dundi_osx_eid6-1.4.diff uploaded by caio1982 (license 22)
Tested by: caio1982, mvanbaak

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@98400 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 62e55abf95d75dba658e463f0a2841e2fa065a9d..26a3e51a21ee848abd10875bd91e1f6e9a97cf52 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -37,6 +37,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <pthread.h>
 #include <net/if.h>
 
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) 
+#include <net/if_dl.h>
+#include <ifaddrs.h>
+#endif
+
 #include "asterisk/file.h"
 #include "asterisk/logger.h"
 #include "asterisk/channel.h"
@@ -399,8 +404,7 @@ static void reset_global_eid(void)
                if (ioctl(s, SIOCGIFHWADDR, &ifr))
                        continue;
                memcpy(&global_eid, ((unsigned char *)&ifr.ifr_hwaddr) + 2, sizeof(global_eid));
-               ast_debug(1, "Seeding global EID '%s' from '%s'\n", 
-                               dundi_eid_to_str(eid_str, sizeof(eid_str), &global_eid), ifr.ifr_name);
+               ast_debug(1, "Seeding global EID '%s' from '%s' using 'siocgifhwaddr'\n", dundi_eid_to_str(eid_str, sizeof(eid_str), &global_eid), ifr.ifr_name);
                close(s);
                return;
        }
@@ -413,12 +417,10 @@ static void reset_global_eid(void)
        if (getifaddrs(&ifap) == 0) {
                struct ifaddrs *p;
                for (p = ifap; p; p = p->ifa_next) {
-                       if (p->ifa_addr->sa_family == AF_LINK) {
+                       if ((p->ifa_addr->sa_family == AF_LINK) && !(p->ifa_flags & IFF_LOOPBACK) && (p->ifa_flags & IFF_RUNNING)) {
                                struct sockaddr_dl* sdp = (struct sockaddr_dl*) p->ifa_addr;
-                               memcpy(
-                                       &(global_eid.eid),
-                                       sdp->sdl_data + sdp->sdl_nlen, 6);
-                               ast_debug(1, "Seeding global EID '%s' from '%s'\n", dundi_eid_to_str(eid_str, sizeof(eid_str), &global_eid), ifap->ifa_name);
+                               memcpy(&(global_eid.eid), sdp->sdl_data + sdp->sdl_nlen, 6);
+                               ast_debug(1, "Seeding global EID '%s' from '%s' using 'getifaddrs'\n", dundi_eid_to_str(eid_str, sizeof(eid_str), &global_eid), p->ifa_name);
                                freeifaddrs(ifap);
                                return;
                        }
@@ -427,7 +429,7 @@ static void reset_global_eid(void)
        }
 #endif
 #endif
-       ast_log(LOG_NOTICE, "No ethernet interface found for seeding global EID  You will have to set it manually.\n");
+       ast_log(LOG_NOTICE, "No ethernet interface found for seeding global EID. You will have to set it manually.\n");
 }
 
 static int get_trans_id(void)