oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Protect AF_INET6 with #ifdef HAVE_IPV6.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18376 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-10-09 11:57:48 +00:00
parent 2d9ff66021
commit 781c638494
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/roken/socket_wrapper.c
View File

@@ -167,9 +167,11 @@ static void set_port(int family, int prt, struct sockaddr *addr)
case AF_INET: case AF_INET:
((struct sockaddr_in *)addr)->sin_port = htons(prt); ((struct sockaddr_in *)addr)->sin_port = htons(prt);
break; break;
#ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
((struct sockaddr_in6 *)addr)->sin6_port = htons(prt); ((struct sockaddr_in6 *)addr)->sin6_port = htons(prt);
break; break;
#endif
} }
} }
@@ -274,6 +276,7 @@ static int convert_un_in(const struct sockaddr_un *un, struct sockaddr *in, sock
*len = sizeof(*in2); *len = sizeof(*in2);
break; break;
} }
#ifdef HAVE_IPV6
case SOCKET_TYPE_CHAR_TCP_V6: case SOCKET_TYPE_CHAR_TCP_V6:
case SOCKET_TYPE_CHAR_UDP_V6: { case SOCKET_TYPE_CHAR_UDP_V6: {
struct sockaddr_in6 *in2 = (struct sockaddr_in6 *)in; struct sockaddr_in6 *in2 = (struct sockaddr_in6 *)in;
@@ -291,6 +294,7 @@ static int convert_un_in(const struct sockaddr_un *un, struct sockaddr *in, sock
*len = sizeof(*in2); *len = sizeof(*in2);
break; break;
} }
#endif
default: default:
errno = EINVAL; errno = EINVAL;
return -1; return -1;
@@ -351,6 +355,7 @@ static int convert_in_un_remote(struct socket_info *si, const struct sockaddr *i
} }
if (bcast) *bcast = is_bcast; if (bcast) *bcast = is_bcast;
} }
#ifdef HAVE_IPV6
case AF_INET6: { case AF_INET6: {
const struct sockaddr_in6 *in = const struct sockaddr_in6 *in =
(const struct sockaddr_in6 *)inaddr; (const struct sockaddr_in6 *)inaddr;
@@ -371,6 +376,7 @@ static int convert_in_un_remote(struct socket_info *si, const struct sockaddr *i
break; break;
} }
#endif
default: default:
errno = ENETUNREACH; errno = ENETUNREACH;
return -1; return -1;
@@ -455,6 +461,7 @@ static int convert_in_un_alloc(struct socket_info *si, const struct sockaddr *in
return -1; return -1;
} }
} }
#ifdef HAVE_IPV6
case AF_INET6: { case AF_INET6: {
const struct sockaddr_in6 *in = const struct sockaddr_in6 *in =
(const struct sockaddr_in6 *)inaddr; (const struct sockaddr_in6 *)inaddr;
@@ -475,6 +482,7 @@ static int convert_in_un_alloc(struct socket_info *si, const struct sockaddr *in
break; break;
} }
#endif
default: default:
errno = ENETUNREACH; errno = ENETUNREACH;
return -1; return -1;
@@ -520,7 +528,9 @@ static int sockaddr_convert_to_un(struct socket_info *si, const struct sockaddr
switch (in_addr->sa_family) { switch (in_addr->sa_family) {
case AF_INET: case AF_INET:
#ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
#endif
switch (si->type) { switch (si->type) {
case SOCK_STREAM: case SOCK_STREAM:
case SOCK_DGRAM: case SOCK_DGRAM:
@@ -566,7 +576,9 @@ static int sockaddr_convert_from_un(const struct socket_info *si,
switch (family) { switch (family) {
case AF_INET: case AF_INET:
#ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
#endif
switch (si->type) { switch (si->type) {
case SOCK_STREAM: case SOCK_STREAM:
case SOCK_DGRAM: case SOCK_DGRAM:
@@ -909,7 +921,9 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add
switch (si->family) { switch (si->family) {
case AF_INET: case AF_INET:
#ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
#endif
break; break;
default: default:
return; return;
@@ -1175,7 +1189,9 @@ _PUBLIC_ int swrap_socket(int family, int type, int protocol)
switch (family) { switch (family) {
case AF_INET: case AF_INET:
#ifdef HAVE_IPV6
case AF_INET6: case AF_INET6:
#endif
break; break;
case AF_UNIX: case AF_UNIX:
return real_socket(family, type, protocol); return real_socket(family, type, protocol);
@@ -1353,6 +1369,7 @@ static int swrap_auto_bind(struct socket_info *si)
si->myname = sockaddr_dup(&in, si->myname_len); si->myname = sockaddr_dup(&in, si->myname_len);
break; break;
} }
#ifdef HAVE_IPV6
case AF_INET6: { case AF_INET6: {
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
@@ -1375,6 +1392,7 @@ static int swrap_auto_bind(struct socket_info *si)
si->myname = sockaddr_dup(&in6, si->myname_len); si->myname = sockaddr_dup(&in6, si->myname_len);
break; break;
} }
#endif
default: default:
errno = ESOCKTNOSUPPORT; errno = ESOCKTNOSUPPORT;
return -1; return -1;