[asterisk-commits] tilghman: trunk r298052 - in /trunk: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Dec 10 10:28:14 2010
New Revision: 298052

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

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in
    trunk/main/netsock.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=298052&r1=298051&r2=298052
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Dec 10 10:28:14 2010
@@ -490,6 +490,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: trunk/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=298052&r1=298051&r2=298052
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Fri Dec 10 10:28:14 2010
@@ -812,6 +812,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: trunk/main/netsock.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/netsock.c?view=diff&rev=298052&r1=298051&r2=298052
==============================================================================
--- trunk/main/netsock.c (original)
+++ trunk/main/netsock.c Fri Dec 10 10:28:14 2010
@@ -236,7 +236,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;