diff options
| -rw-r--r-- | main/acl.c | 9 | ||||
| -rw-r--r-- | res/res_phoneprov.c | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/main/acl.c b/main/acl.c index 9944f5076..4a26ec3ce 100644 --- a/main/acl.c +++ b/main/acl.c @@ -28,7 +28,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/network.h" -#include <ifaddrs.h> #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) #include <fcntl.h> @@ -37,6 +36,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #if defined(SOLARIS) #include <sys/sockio.h> +#include <net/if.h> +#else +#include <ifaddrs.h> #endif #include "asterisk/acl.h" @@ -118,8 +120,9 @@ static int get_local_address(struct in_addr *ourip) int rtnerr; const struct sockaddr_in *sin; #endif /* BSD_OR_LINUX */ - struct in_addr best_addr = { 0, }; + struct in_addr best_addr; int best_score = -100; + memset(&best_addr, 0, sizeof(best_addr)); #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) rtnerr = getifaddrs(&ifaphead); @@ -177,7 +180,7 @@ static int get_local_address(struct in_addr *ourip) for (ifr = (struct lifreq *)buf, x = 0; x < ifn.lifn_count; ifr++, x++) { sa = (struct sockaddr_in *)&(ifr->lifr_addr); - score_address(sin, &best_addr, &best_score); + score_address(sa, &best_addr, &best_score); res = 0; if (best_score == 0) diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c index bffe1a2df..febf2ed05 100644 --- a/res/res_phoneprov.c +++ b/res/res_phoneprov.c @@ -31,7 +31,9 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> - +#ifdef SOLARIS +#include <sys/sockio.h> +#endif ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $") #include "asterisk/file.h" |