kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wed May 13 05:14:56 CDT 2009 Pekka Pessi <first.last@nokia.com> 

* tport.c: better checking of IP6 addresses
  Ignore-this: 49f502ccaaf771abed1e5b2d00eaa8b8
  
  Coverity issue.


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13335 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-05-15 16:04:28 +00:00
parent de69d8ea95
commit 6f7641f94a
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Fri May 15 11:03:27 CDT 2009 Fri May 15 11:04:08 CDT 2009

38
libs/sofia-sip/libsofia-sip-ua/tport/tport.c
View File

@ -1593,7 +1593,7 @@ int tport_bind_server(tport_master_t *mr,
enum tport_via public, enum tport_via public,
tagi_t *tags) tagi_t *tags)
{ {
char hostname[256]; char hostname[TPORT_HOSTPORTSIZE];
char const *canon = NULL, *host, *service; char const *canon = NULL, *host, *service;
int error = 0, not_supported, family = 0; int error = 0, not_supported, family = 0;
tport_primary_t *pri = NULL, **tbf; tport_primary_t *pri = NULL, **tbf;
@ -1613,10 +1613,12 @@ int tport_bind_server(tport_master_t *mr,
host = NULL; host = NULL;
} }
#ifdef SU_HAVE_IN6 #ifdef SU_HAVE_IN6
else if (tpn->tpn_host && tpn->tpn_host[0] == '[') { else if (host_is_ip6_reference(tpn->tpn_host)) {
/* Remove [] around IPv6 addresses. */ /* Remove [] around IPv6 addresses. */
host = strcpy(hostname, tpn->tpn_host + 1); size_t len = strlen(tpn->tpn_host);
hostname[strlen(hostname) - 1] = '\0'; assert(len < sizeof hostname);
host = memcpy(hostname, tpn->tpn_host + 1, len - 2);
hostname[len - 2] = '\0';
} }
#endif #endif
else else
@ -3986,29 +3988,21 @@ tport_resolve(tport_t *self, msg_t *msg, tp_name_t const *tpn)
hints->ai_socktype = self->tp_addrinfo->ai_socktype; hints->ai_socktype = self->tp_addrinfo->ai_socktype;
hints->ai_protocol = self->tp_addrinfo->ai_protocol; hints->ai_protocol = self->tp_addrinfo->ai_protocol;
if (host_is_ip6_reference(tpn->tpn_host)) {
/* Remove [] around IPv6 address */
size_t len = strlen(tpn->tpn_host);
assert(len < sizeof ipaddr);
host = memcpy(ipaddr, tpn->tpn_host + 1, len - 2);
ipaddr[len - 2] = '\0';
hints->ai_flags |= AI_NUMERICHOST;
}
else {
#if HAVE_OPEN_C #if HAVE_OPEN_C
if (host_is_ip_address(tpn->tpn_host)) if (host_is_ip_address(tpn->tpn_host))
hints->ai_flags |= AI_NUMERICHOST; hints->ai_flags |= AI_NUMERICHOST;
#endif #endif
if (tpn->tpn_host[0] == '[') {
/* Remove [] around IPv6 address */
char *end;
hints->ai_flags |= AI_NUMERICHOST;
host = strncpy(ipaddr, tpn->tpn_host + 1, sizeof(ipaddr) - 1);
ipaddr[sizeof(ipaddr) - 1] = '\0';
if ((end = strchr(host, ']'))) {
*end = 0;
}
else {
SU_DEBUG_3(("tport_resolve: bad IPv6 address\n"));
msg_set_errno(msg, EINVAL);
return -1;
}
}
else
host = tpn->tpn_host; host = tpn->tpn_host;
}
if ((error = su_getaddrinfo(host, tpn->tpn_port, hints, &res))) { if ((error = su_getaddrinfo(host, tpn->tpn_port, hints, &res))) {
SU_DEBUG_3(("tport_resolve: getaddrinfo(\"%s\":%s): %s\n", SU_DEBUG_3(("tport_resolve: getaddrinfo(\"%s\":%s): %s\n",