diff --git a/configure b/configure index 13069d4d3059d740521929ef024dcb924e3f7cd7..c7cd5e893fc96c1d8777e598ee75fc516eb7a5b4 100755 --- 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. # @@ -12732,6 +12732,17 @@ cat >>confdefs.h <<_ACEOF _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 diff --git a/configure.ac b/configure.ac index ee27cebd8dc5350384002d397f828e2c37a29e29..96139894296a399ac01b4b714481f99c0a78b2fb 100644 --- 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 94dde0b31db693d9c69cb62b1432631ab66b6783..2ec7b7ed816a884893c3ad4f760b0fecdf0eb2cf 100644 --- 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 b6dfc6e9cd96db7de0f8bdeb2cfc3a648337c88d..5cab1c19a488f9004e81460e4dc7155ea279ba8e 100644 --- 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;