diff options
| -rwxr-xr-x | aconfigure | 145 | ||||
| -rw-r--r-- | aconfigure.ac | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 5 | ||||
| -rw-r--r-- | pjlib/src/pj/ip_helper_generic.c | 65 |
5 files changed, 212 insertions, 5 deletions
@@ -5699,6 +5699,151 @@ _ACEOF fi +if test "${ac_cv_header_net_if_h+set}" = set; then + echo "$as_me:$LINENO: checking for net/if.h" >&5 +echo $ECHO_N "checking for net/if.h... $ECHO_C" >&6 +if test "${ac_cv_header_net_if_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_net_if_h" >&5 +echo "${ECHO_T}$ac_cv_header_net_if_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking net/if.h usability" >&5 +echo $ECHO_N "checking net/if.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <net/if.h> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking net/if.h presence" >&5 +echo $ECHO_N "checking net/if.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <net/if.h> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: net/if.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: net/if.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: net/if.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: net/if.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: net/if.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: net/if.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: net/if.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: net/if.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: net/if.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: net/if.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: net/if.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------ ## +## Report this to the pjproject lists. ## +## ------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for net/if.h" >&5 +echo $ECHO_N "checking for net/if.h... $ECHO_C" >&6 +if test "${ac_cv_header_net_if_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_net_if_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_net_if_h" >&5 +echo "${ECHO_T}$ac_cv_header_net_if_h" >&6 + +fi +if test $ac_cv_header_net_if_h = yes; then + cat >>confdefs.h <<\_ACEOF +#define PJ_HAS_NET_IF_H 1 +_ACEOF + +fi + + if test "${ac_cv_header_setjmp_h+set}" = set; then echo "$as_me:$LINENO: checking for setjmp.h" >&5 echo $ECHO_N "checking for setjmp.h... $ECHO_C" >&6 diff --git a/aconfigure.ac b/aconfigure.ac index 4ffd1ae6..8c8e15da 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -143,6 +143,7 @@ AC_CHECK_HEADER(malloc.h,[AC_DEFINE(PJ_HAS_MALLOC_H,1)]) AC_CHECK_HEADER(netdb.h,[AC_DEFINE(PJ_HAS_NETDB_H,1)]) AC_CHECK_HEADER(netinet/in.h,[AC_DEFINE(PJ_HAS_NETINET_IN_H,1)]) AC_CHECK_HEADER(netinet/ip.h,[AC_DEFINE(PJ_HAS_NETINET_IP_H,1)]) +AC_CHECK_HEADER(net/if.h,[AC_DEFINE(PJ_HAS_NET_IF_H,1)]) AC_CHECK_HEADER(setjmp.h,[AC_DEFINE(PJ_HAS_SETJMP_H,1)]) AC_CHECK_HEADER(stdarg.h,[AC_DEFINE(PJ_HAS_STDARG_H,1)]) AC_CHECK_HEADER(stddef.h,[AC_DEFINE(PJ_HAS_STDDEF_H,1)]) diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index b1292373..58bf8690 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -51,6 +51,7 @@ #undef PJ_HAS_NETDB_H #undef PJ_HAS_NETINET_IN_H #undef PJ_HAS_NETINET_IP_H +#undef PJ_HAS_NET_IF_H #undef PJ_HAS_SETJMP_H #undef PJ_HAS_STDARG_H #undef PJ_HAS_STDDEF_H diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index 40c03455..7cc0d654 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -57,6 +57,11 @@ # include <netinet/ip.h> #endif +#if defined(PJ_HAS_NET_IF_H) && PJ_HAS_NET_IF_H != 0 +/* For interface enumeration in ip_helper */ +# include <net/if.h> +#endif + #if defined(PJ_HAS_ARPA_INET_H) && PJ_HAS_ARPA_INET_H != 0 # include <arpa/inet.h> #endif diff --git a/pjlib/src/pj/ip_helper_generic.c b/pjlib/src/pj/ip_helper_generic.c index 3b713f5a..092bb28e 100644 --- a/pjlib/src/pj/ip_helper_generic.c +++ b/pjlib/src/pj/ip_helper_generic.c @@ -21,12 +21,10 @@ #include <pj/assert.h> #include <pj/errno.h> #include <pj/string.h> +#include <pj/compat/socket.h> -/* - * Enumerate the local IP interface currently active in the host. - */ -PJ_DEF(pj_status_t) pj_enum_ip_interface(unsigned *p_cnt, - pj_in_addr ifs[]) +static pj_status_t dummy_enum_ip_interface(unsigned *p_cnt, + pj_in_addr ifs[]) { pj_status_t status; @@ -43,6 +41,63 @@ PJ_DEF(pj_status_t) pj_enum_ip_interface(unsigned *p_cnt, return PJ_SUCCESS; } +#ifdef SIOCGIFCONF +static pj_status_t sock_enum_ip_interface(unsigned *p_cnt, + pj_in_addr ifs[]) +{ + pj_sock_t sock; + char buf[512]; + struct ifconf ifc; + struct ifreq *ifr; + int i, count; + pj_status_t status; + + status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock); + if (status != PJ_SUCCESS) + return status; + + /* Query available interfaces */ + ifc.ifc_len = sizeof(buf); + ifc.ifc_buf = buf; + + if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) { + int oserr = pj_get_netos_error(); + pj_sock_close(sock); + return PJ_RETURN_OS_ERROR(oserr); + } + + /* Done with socket */ + pj_sock_close(sock); + + /* Interface interfaces */ + ifr = (struct ifreq*) ifc.ifc_req; + count = ifc.ifc_len / sizeof(struct ifreq); + if (count > *p_cnt) + count = *p_cnt; + else + *p_cnt = count; + for (i=0; i<count; ++i) { + struct ifreq *itf = &ifr[i]; + ifs[i].s_addr = ((struct sockaddr_in *)&itf->ifr_addr)->sin_addr.s_addr; + } + + return PJ_SUCCESS; +} +#endif /* SIOCGIFCONF */ + +/* + * Enumerate the local IP interface currently active in the host. + */ +PJ_DEF(pj_status_t) pj_enum_ip_interface(unsigned *p_cnt, + pj_in_addr ifs[]) +{ +#ifdef SIOCGIFCONF + if (sock_enum_ip_interface(p_cnt, ifs) == PJ_SUCCESS) + return PJ_SUCCESS; +#endif + return dummy_enum_ip_interface(p_cnt, ifs); +} + /* * Enumerate the IP routing table for this host. */ |