Merged revisions 298051 via svnmerge from

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

................
  r298051 | tilghman | 2010-12-10 10:26:46 -0600 (Fri, 10 Dec 2010) | 18 lines

  Merged revisions 298050 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r298050 | tilghman | 2010-12-10 10:24:13 -0600 (Fri, 10 Dec 2010) | 11 lines

    Portability issue on OpenSolaris.

    Also detect the required structure element, because OpenSolaris defines
    SIOCGIFHWADDR, but without support for IP sockets.

    (closes issue #18442)
     Reported by: ranjtech
     Patches:
           20101209__issue18442.diff.txt uploaded by tilghman (license 14)
     Tested by: ranjtech
  ........
................

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

diff --git a/configure b/configure
index 13069d4..c7cd5e8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 294431 .
+# From configure.ac Revision: 296535 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk trunk.
 #
@@ -12734,6 +12734,17 @@ _ACEOF
 
 fi
 
+ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_ifru.ifru_hwaddr" "ac_cv_member_struct_ifreq_ifr_ifru_ifru_hwaddr" "#include <net/if.h>
+"
+if test "x$ac_cv_member_struct_ifreq_ifr_ifru_ifru_hwaddr" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR 1
+_ACEOF
+
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
 if test "${ac_cv_header_time+set}" = set; then :

diff --git a/configure.ac b/configure.ac
index ee27ceb..9613989 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -490,6 +490,7 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_CHECK_MEMBERS([struct stat.st_blksize])
 AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid], [], [], [#include <sys/socket.h>])
+AC_CHECK_MEMBERS([struct ifreq.ifr_ifru.ifru_hwaddr], [], [], [#include <net/if.h>])
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_C_VOLATILE

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 94dde0b..2ec7b7e 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -813,6 +813,9 @@
 /* Define to 1 if you have the `strtoq' function. */
 #undef HAVE_STRTOQ
 
+/* Define to 1 if `ifr_ifru.ifru_hwaddr' is a member of `struct ifreq'. */
+#undef HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR
+
 /* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 

diff --git a/main/netsock.c b/main/netsock.c
index b6dfc6e..5cab1c1 100644 (file)
--- a/main/netsock.c
+++ b/main/netsock.c
@@ -236,7 +236,7 @@ char *ast_eid_to_str(char *s, int maxlen, struct ast_eid *eid)
 
 void ast_set_default_eid(struct ast_eid *eid)
 {
-#if defined(SIOCGIFHWADDR)
+#if defined(SIOCGIFHWADDR) && defined(HAVE_STRUCT_IFREQ_IFR_IFRU_IFRU_HWADDR)
        int s, x = 0;
        char eid_str[20];
        struct ifreq ifr;