DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly support the address format for both IPv4 and IPv6

Browse Source
This commit is contained in:
Pierre Pronchery 2012-12-03 23:14:59 +01:00
parent 87f24e174f
commit 81a336cce2
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/transport/tcp.c
View File

@ -187,21 +187,26 @@ static TCP * _tcp_init(AppTransportPluginHelper * helper,
static int _init_address(TCP * tcp, char const * name, int domain)
{
char sep = ':';
char * p;
char * q;
char * r;
long l = -1;
long l;
struct addrinfo hints;
int res = 0;
/* guess the port separator */
if((q = strchr(name, ':')) != NULL && strchr(++q, ':') != NULL)
sep = '.';
/* obtain the name */
if((p = strdup(name)) == NULL)
return -error_set_code(1, "%s", strerror(errno));
/* FIXME wrong for IPv6 notation (should be '.' then) */
if((q = strrchr(p, ':')) != NULL)
/* obtain the port number */
if((q = strrchr(p, sep)) == NULL)
l = -error_set_code(1, "%s", strerror(EINVAL));
else
{
*(q++) = '\0';
/* obtain the port number */
l = strtol(q, &r, 10);
if(q[0] == '\0' || *r != '\0')
l = -error_set_code(1, "%s", strerror(EINVAL));

13
src/transport/udp.c
View File

@ -146,21 +146,26 @@ static UDP * _udp_init(AppTransportPluginHelper * helper,
static int _init_address(UDP * udp, char const * name, int domain)
{
char sep = ':';
char * p;
char * q;
char * r;
long l = -1;
long l;
struct addrinfo hints;
int res = 0;
/* guess the port separator */
if((q = strchr(name, ':')) != NULL && strchr(++q, ':') != NULL)
sep = '.';
/* obtain the name */
if((p = strdup(name)) == NULL)
return -error_set_code(1, "%s", strerror(errno));
/* FIXME wrong for IPv6 notation (should be '.' then) */
if((q = strrchr(p, ':')) != NULL)
/* obtain the port number */
if((q = strrchr(p, sep)) == NULL)
l = -error_set_code(1, "%s", strerror(EINVAL));
else
{
*(q++) = '\0';
/* obtain the port number */
l = strtol(q, &r, 10);
if(q[0] == '\0' || *r != '\0')
l = -error_set_code(1, "%s", strerror(EINVAL));