diff options
Diffstat (limited to 'pjlib')
-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 |
3 files changed, 66 insertions, 5 deletions
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. */ |