kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at making lookup_iface work under FreeBSD. Not yet tested, but it compiles under OS X. And still works under linux.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97653 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2008-01-10 00:22:50 +00:00
parent 0da0033675
commit 84e25e15cf
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/res_phoneprov.c
View File

@@ -29,6 +29,8 @@
#include "asterisk.h" #include "asterisk.h"
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $") ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $")
@@ -58,12 +60,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $")
#define VAR_BUF_SIZE 4096 #define VAR_BUF_SIZE 4096
/*! \brief for use in lookup_iface */
struct my_ifreq {
char ifrn_name[IFNAMSIZ]; /* Interface name, e.g. "eth0", "ppp0", etc. */
struct sockaddr_in ifru_addr;
};
/*! \brief for use in lookup_iface */ /*! \brief for use in lookup_iface */
static struct in_addr __ourip = { .s_addr = 0x00000000, }; static struct in_addr __ourip = { .s_addr = 0x00000000, };
@@ -183,10 +179,11 @@ static char *ftype2mtype(const char *ftype)
static int lookup_iface(const char *iface, struct in_addr *address) static int lookup_iface(const char *iface, struct in_addr *address)
{ {
int mysock, res = 0; int mysock, res = 0;
struct my_ifreq ifreq; struct ifreq ifr;
struct sockaddr_in *sin;
memset(&ifreq, 0, sizeof(ifreq)); memset(&ifr, 0, sizeof(ifr));
ast_copy_string(ifreq.ifrn_name, iface, sizeof(ifreq.ifrn_name)); ast_copy_string(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
mysock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); mysock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
if (mysock < 0) { if (mysock < 0) {
@@ -194,7 +191,7 @@ static int lookup_iface(const char *iface, struct in_addr *address)
return -1; return -1;
} }
res = ioctl(mysock, SIOCGIFADDR, &ifreq); res = ioctl(mysock, SIOCGIFADDR, &ifr);
close(mysock); close(mysock);
@@ -203,7 +200,8 @@ static int lookup_iface(const char *iface, struct in_addr *address)
memcpy(address, &__ourip, sizeof(__ourip)); memcpy(address, &__ourip, sizeof(__ourip));
return -1; return -1;
} else { } else {
memcpy(address, &ifreq.ifru_addr.sin_addr, sizeof(ifreq.ifru_addr.sin_addr)); sin = (struct sockaddr_in *)&ifr.ifr_addr;
memcpy(address, &sin->sin_addr, sizeof(*address));
return 0; return 0;
} }
} }