[asterisk-commits] tilghman: branch 1.6.2 r298050 - in /branches/1.6.2: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Dec 10 10:24:13 2010
New Revision: 298050

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=298050
Log:
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

Modified:
    branches/1.6.2/configure
    branches/1.6.2/configure.ac
    branches/1.6.2/include/asterisk/autoconfig.h.in
    branches/1.6.2/main/netsock.c

Modified: branches/1.6.2/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configure.ac?view=diff&rev=298050&r1=298049&r2=298050
==============================================================================
--- branches/1.6.2/configure.ac (original)
+++ branches/1.6.2/configure.ac Fri Dec 10 10:24:13 2010
@@ -393,6 +393,7 @@
 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

Modified: branches/1.6.2/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/include/asterisk/autoconfig.h.in?view=diff&rev=298050&r1=298049&r2=298050
==============================================================================
--- branches/1.6.2/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.2/include/asterisk/autoconfig.h.in Fri Dec 10 10:24:13 2010
@@ -701,6 +701,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

Modified: branches/1.6.2/main/netsock.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/netsock.c?view=diff&rev=298050&r1=298049&r2=298050
==============================================================================
--- branches/1.6.2/main/netsock.c (original)
+++ branches/1.6.2/main/netsock.c Fri Dec 10 10:24:13 2010
@@ -234,7 +234,7 @@
 
 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;