[Asterisk-cvs] asterisk/channels chan_h323.c,1.44,1.45 chan_iax.c,1.55,1.56 chan_iax2.c,1.124,1.125 chan_mgcp.c,1.44,1.45 chan_sip.c,1.337,1.338 chan_skinny.c,1.35,1.36
markster at lists.digium.com
markster at lists.digium.com
Wed Apr 21 20:15:53 CDT 2004
Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv19986/channels
Modified Files:
chan_h323.c chan_iax.c chan_iax2.c chan_mgcp.c chan_sip.c
chan_skinny.c
Log Message:
gethostbyname isn't reentrant, who knew...
Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- chan_h323.c 19 Apr 2004 08:11:51 -0000 1.44
+++ chan_h323.c 22 Apr 2004 00:20:33 -0000 1.45
@@ -1437,7 +1437,7 @@
struct oh323_peer *peer = NULL;
struct oh323_user *user = NULL;
struct oh323_alias *alias = NULL;
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
char *cat;
char *utype;
@@ -1464,7 +1464,7 @@
if (!strcasecmp(v->name, "port")) {
port = (int)strtol(v->value, NULL, 10);
} else if (!strcasecmp(v->name, "bindaddr")) {
- if (!(hp = gethostbyname(v->value))) {
+ if (!(hp = ast_gethostbyname(v->value, &ahp))) {
ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
} else {
memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
Index: chan_iax.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- chan_iax.c 6 Apr 2004 22:17:31 -0000 1.55
+++ chan_iax.c 22 Apr 2004 00:20:33 -0000 1.56
@@ -1663,7 +1663,7 @@
static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani, int *maxtime, char *peer, char *context)
{
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
struct iax_peer *p;
int found=0;
if (sendani)
@@ -1710,7 +1710,7 @@
}
ast_mutex_unlock(&peerl.lock);
if (!p && !found) {
- hp = gethostbyname(peer);
+ hp = ast_gethostbyname(peer, &ahp);
if (hp) {
memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
sin->sin_port = htons(AST_DEFAULT_IAX_PORTNO);
@@ -3358,7 +3358,7 @@
char *porta;
char *stringp=NULL;
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
if (!value)
return -1;
strncpy(copy, value, sizeof(copy)-1);
@@ -3380,7 +3380,7 @@
ast_log(LOG_WARNING, "%s is not a valid port number at line %d\n", porta, lineno);
return -1;
}
- hp = gethostbyname(hostname);
+ hp = ast_gethostbyname(hostname, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Host '%s' not found at line %d\n", hostname, lineno);
return -1;
Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- chan_iax2.c 21 Apr 2004 00:33:09 -0000 1.124
+++ chan_iax2.c 22 Apr 2004 00:20:33 -0000 1.125
@@ -1925,7 +1925,7 @@
static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani, int *maxtime, char *peer, char *context, int *trunk, int *notransfer, char *secret, int seclen)
{
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
struct iax2_peer *p;
int found=0;
if (sendani)
@@ -1980,7 +1980,7 @@
}
}
if (!p && !found) {
- hp = gethostbyname(peer);
+ hp = ast_gethostbyname(peer, &ahp);
if (hp) {
memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
sin->sin_port = htons(IAX_DEFAULT_PORTNO);
@@ -3860,7 +3860,7 @@
char *porta;
char *stringp=NULL;
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
if (!value)
return -1;
strncpy(copy, value, sizeof(copy)-1);
@@ -3882,7 +3882,7 @@
ast_log(LOG_WARNING, "%s is not a valid port number at line %d\n", porta, lineno);
return -1;
}
- hp = gethostbyname(hostname);
+ hp = ast_gethostbyname(hostname, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Host '%s' not found at line %d\n", hostname, lineno);
return -1;
Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- chan_mgcp.c 8 Apr 2004 19:19:24 -0000 1.44
+++ chan_mgcp.c 22 Apr 2004 00:20:33 -0000 1.45
@@ -1573,7 +1573,7 @@
int peercapability, peerNonCodecCapability;
struct sockaddr_in sin;
char *codecs;
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
int codec;
int iterator;
struct mgcp_endpoint *p = sub->parent;
@@ -1590,7 +1590,7 @@
return -1;
}
/* XXX This could block for a long time, and block the main thread! XXX */
- hp = gethostbyname(host);
+ hp = ast_gethostbyname(host, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Unable to lookup host in c= line, '%s'\n", c);
return -1;
@@ -1772,7 +1772,7 @@
struct sockaddr_in dest;
struct mgcp_endpoint *p = sub->parent;
/* XXX We break with the "recommendation" and send our IP, in order that our
- peer doesn't have to gethostbyname() us XXX */
+ peer doesn't have to ast_gethostbyname() us XXX */
len = 0;
if (!sub->rtp) {
ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
@@ -3651,7 +3651,7 @@
struct mgcp_gateway *g;
struct mgcp_endpoint *e;
char *cat;
- struct hostent *hp;
+ struct ast_hostent ahp; struct hostent *hp;
int format;
if (gethostname(ourhost, sizeof(ourhost))) {
@@ -3670,7 +3670,7 @@
while(v) {
/* Create the interface list */
if (!strcasecmp(v->name, "bindaddr")) {
- if (!(hp = gethostbyname(v->value))) {
+ if (!(hp = ast_gethostbyname(v->value, &ahp))) {
ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
} else {
memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
@@ -3749,7 +3749,7 @@
if (ntohl(bindaddr.sin_addr.s_addr)) {
memcpy(&__ourip, &bindaddr.sin_addr, sizeof(__ourip));
} else {
- hp = gethostbyname(ourhost);
+ hp = ast_gethostbyname(ourhost, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Unable to get our IP address, MGCP disabled\n");
ast_destroy(cfg);
Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.337
retrieving revision 1.338
diff -u -d -r1.337 -r1.338
--- chan_sip.c 21 Apr 2004 21:55:40 -0000 1.337
+++ chan_sip.c 22 Apr 2004 00:20:33 -0000 1.338
@@ -808,6 +808,7 @@
static int create_addr(struct sip_pvt *r, char *peer)
{
struct hostent *hp;
+ struct ast_hostent ahp;
struct sip_peer *p;
int found=0;
char *port;
@@ -905,7 +906,7 @@
portno = tportno;
}
}
- hp = gethostbyname(hostn);
+ hp = ast_gethostbyname(hostn, &ahp);
if (hp) {
strncpy(r->tohost, peer, sizeof(r->tohost) - 1);
memcpy(&r->sa.sin_addr, hp->h_addr, sizeof(r->sa.sin_addr));
@@ -1858,6 +1859,7 @@
char *stringp=NULL;
struct hostent *hp;
+ struct ast_hostent ahp;
if (!value)
return -1;
strncpy(copy, value, sizeof(copy)-1);
@@ -1893,7 +1895,7 @@
ast_log(LOG_WARNING, "%s is not a valid port number at line %d\n", porta, lineno);
return -1;
}
- hp = gethostbyname(hostname);
+ hp = ast_gethostbyname(hostname, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Host '%s' not found at line %d\n", hostname, lineno);
return -1;
@@ -2011,6 +2013,7 @@
struct sockaddr_in sin;
char *codecs;
struct hostent *hp;
+ struct ast_hostent ahp;
int codec;
int iterator;
int sendonly = 0;
@@ -2032,7 +2035,7 @@
return -1;
}
/* XXX This could block for a long time, and block the main thread! XXX */
- hp = gethostbyname(host);
+ hp = ast_gethostbyname(host, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Unable to lookup host in c= line, '%s'\n", c);
return -1;
@@ -2315,6 +2318,7 @@
char *h, *maddr, hostname[256];
int port, hn;
struct hostent *hp;
+ struct ast_hostent ahp;
/* Parse uri to h (host) and port - uri is already just the part inside the <> */
/* general form we are expecting is sip[s]:username[:password]@host[:port][;...] */
@@ -2356,7 +2360,7 @@
strncpy(hostname, maddr, hn); hostname[hn] = '\0';
}
- hp = gethostbyname(hostname);
+ hp = ast_gethostbyname(hostname, &ahp);
if (hp == NULL) {
ast_log(LOG_WARNING, "Can't find address for host '%s'\n", hostname);
return;
@@ -2646,7 +2650,7 @@
struct sockaddr_in dest;
struct sockaddr_in vdest = { 0, };
/* XXX We break with the "recommendation" and send our IP, in order that our
- peer doesn't have to gethostbyname() us XXX */
+ peer doesn't have to ast_gethostbyname() us XXX */
len = 0;
if (!p->rtp) {
ast_log(LOG_WARNING, "No way to add SDP without an RTP structure\n");
@@ -3220,6 +3224,7 @@
char via[80];
char addr[80];
struct sip_pvt *p;
+ struct ast_hostent ahp;
struct hostent *hp;
/* exit if we are already in process with this registrar ?*/
@@ -3261,7 +3266,7 @@
based on whether the remote host is on the external or
internal network so we can register through nat
*/
- if ((hp = gethostbyname(r->hostname))) {
+ if ((hp = ast_gethostbyname(r->hostname, &ahp))) {
if (ast_sip_ouraddrfor((struct in_addr *)hp->h_addr, &p->ourip))
memcpy(&p->ourip, &bindaddr.sin_addr, sizeof(p->ourip));
}
@@ -3468,6 +3473,7 @@
char *c, *n, *pt;
int port;
struct hostent *hp;
+ struct ast_hostent ahp;
struct sockaddr_in oldsin;
if (!strlen(expires)) {
expires = strstr(get_header(req, "Contact"), "expires=");
@@ -3529,7 +3535,7 @@
memcpy(&oldsin, &p->addr, sizeof(oldsin));
if (!p->nat) {
/* XXX This could block for a long time XXX */
- hp = gethostbyname(n);
+ hp = ast_gethostbyname(n, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Invalid host '%s'\n", n);
return -1;
@@ -4162,6 +4168,7 @@
char via[256] = "";
char *c, *pt;
struct hostent *hp;
+ struct ast_hostent ahp;
memset(via, 0, sizeof(via));
strncpy(via, get_header(req, "Via"), sizeof(via) - 1);
@@ -4183,7 +4190,7 @@
*pt = '\0';
pt++;
}
- hp = gethostbyname(c);
+ hp = ast_gethostbyname(c, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "'%s' is not a valid host\n", c);
return -1;
@@ -6025,6 +6032,7 @@
char *dest = data;
struct hostent *hp;
+ struct ast_hostent ahp;
struct sip_peer *p;
int found = 0;
@@ -6058,7 +6066,7 @@
}
ast_mutex_unlock(&peerl.lock);
if (!p && !found) {
- hp = gethostbyname(host);
+ hp = ast_gethostbyname(host, &ahp);
if (hp)
res = AST_DEVICE_UNKNOWN;
}
@@ -6439,6 +6447,7 @@
struct ast_variable *v;
struct sip_peer *peer;
struct sip_user *user;
+ struct ast_hostent ahp;
char *cat;
char *utype;
struct hostent *hp;
@@ -6523,23 +6532,23 @@
if (default_expiry < 1)
default_expiry = DEFAULT_DEFAULT_EXPIRY;
} else if (!strcasecmp(v->name, "bindaddr")) {
- if (!(hp = gethostbyname(v->value))) {
+ if (!(hp = ast_gethostbyname(v->value, &ahp))) {
ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
} else {
memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
}
} else if (!strcasecmp(v->name, "localnet")) {
- if (!(hp = gethostbyname(v->value)))
+ if (!(hp = ast_gethostbyname(v->value, &ahp)))
ast_log(LOG_WARNING, "Invalid localnet keyword: %s\n", v->value);
else
memcpy(&localnet.sin_addr, hp->h_addr, sizeof(localnet.sin_addr));
} else if (!strcasecmp(v->name, "localmask")) {
- if (!(hp = gethostbyname(v->value)))
+ if (!(hp = ast_gethostbyname(v->value, &ahp)))
ast_log(LOG_WARNING, "Invalid localmask keyword: %s\n", v->value);
else
memcpy(&localmask.sin_addr, hp->h_addr, sizeof(localmask.sin_addr));
} else if (!strcasecmp(v->name, "externip")) {
- if (!(hp = gethostbyname(v->value)))
+ if (!(hp = ast_gethostbyname(v->value, &ahp)))
ast_log(LOG_WARNING, "Invalid address for externip keyword: %s\n", v->value);
else
memcpy(&externip.sin_addr, hp->h_addr, sizeof(externip.sin_addr));
@@ -6631,7 +6640,7 @@
if (ntohl(bindaddr.sin_addr.s_addr)) {
memcpy(&__ourip, &bindaddr.sin_addr, sizeof(__ourip));
} else {
- hp = gethostbyname(ourhost);
+ hp = ast_gethostbyname(ourhost, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
return 0;
Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- chan_skinny.c 6 Apr 2004 22:17:32 -0000 1.35
+++ chan_skinny.c 22 Apr 2004 00:20:33 -0000 1.36
@@ -482,7 +482,7 @@
static char ourhost[256];
static int ourport;
static struct in_addr __ourip;
-struct hostent *hp;
+struct ast_hostent ahp; struct hostent *hp;
static int skinnysock = -1;
static pthread_t tcp_thread;
static pthread_t accept_t;
@@ -2511,7 +2511,7 @@
while(v) {
/* Create the interface list */
if (!strcasecmp(v->name, "bindaddr")) {
- if (!(hp = gethostbyname(v->value))) {
+ if (!(hp = ast_gethostbyname(v->value, &ahp))) {
ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
} else {
memcpy(&bindaddr.sin_addr, hp->h_addr, sizeof(bindaddr.sin_addr));
@@ -2545,7 +2545,7 @@
if (ntohl(bindaddr.sin_addr.s_addr)) {
memcpy(&__ourip, &bindaddr.sin_addr, sizeof(__ourip));
} else {
- hp = gethostbyname(ourhost);
+ hp = ast_gethostbyname(ourhost, &ahp);
if (!hp) {
ast_log(LOG_WARNING, "Unable to get our IP address, Skinny disabled\n");
return 0;
More information about the svn-commits
mailing list