sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-06 00:00:47 -04:00
Code Issues Projects Releases Wiki Activity

Don't use pointer to a union member in host_create_from_string_and_family()

Browse Source
This commit is contained in:
Tobias Brunner 2013-01-25 13:18:50 +01:00
parent 572a707765
commit 58fd1f3eef
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstrongswan/networking/host.c
View File

@ -362,7 +362,6 @@ host_t *host_create_from_string_and_family(char *string, int family,
u_int16_t port)
{
union {
sockaddr_t sockaddr;
struct sockaddr_in v4;
struct sockaddr_in6 v6;
} addr;
@ -399,8 +398,8 @@ host_t *host_create_from_string_and_family(char *string, int family,
return NULL;
}
addr.v6.sin6_port = htons(port);
addr.sockaddr.sa_family = AF_INET6;
return host_create_from_sockaddr(&addr.sockaddr);
addr.v6.sin6_family = AF_INET6;
return host_create_from_sockaddr((sockaddr_t*)&addr);
case AF_INET:
if (strchr(string, ':'))
{ /* do not try to convert v6 addresses for v4 family */
@ -412,8 +411,8 @@ host_t *host_create_from_string_and_family(char *string, int family,
return NULL;
}
addr.v4.sin_port = htons(port);
addr.sockaddr.sa_family = AF_INET;
return host_create_from_sockaddr(&addr.sockaddr);
addr.v4.sin_family = AF_INET;
return host_create_from_sockaddr((sockaddr_t*)&addr);
default:
return NULL;
}