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

less exit with failures

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-11-29 09:16:37 -08:00
parent a2b45360c2
commit bad0e733c5
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/roken/socket.c
View File

@@ -119,8 +119,7 @@ socket_addr_size (const struct sockaddr *sa)
return sizeof(struct in6_addr); return sizeof(struct in6_addr);
#endif #endif
default : default :
errx (1, "unknown address family %d", sa->sa_family); return 0;
UNREACHABLE(return 0);
} }
} }
@@ -139,8 +138,7 @@ socket_sockaddr_size (const struct sockaddr *sa)
return sizeof(struct sockaddr_in6); return sizeof(struct sockaddr_in6);
#endif #endif
default: default:
errx (1, "unknown address family %d", sa->sa_family); return 0;
UNREACHABLE(return 0);
} }
} }
@@ -163,8 +161,7 @@ socket_get_address (const struct sockaddr *sa)
} }
#endif #endif
default: default:
errx (1, "unknown address family %d", sa->sa_family); return NULL;
UNREACHABLE(return NULL);
} }
} }
@@ -187,8 +184,7 @@ socket_get_port (const struct sockaddr *sa)
} }
#endif #endif
default : default :
errx (1, "unknown address family %d", sa->sa_family); return 0;
UNREACHABLE(return 0);
} }
} }
@@ -227,18 +223,13 @@ socket_set_portrange (rk_socket_t sock, int restr, int af)
#if defined(IP_PORTRANGE) #if defined(IP_PORTRANGE)
if (af == AF_INET) { if (af == AF_INET) {
int on = restr ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT; int on = restr ? IP_PORTRANGE_HIGH : IP_PORTRANGE_DEFAULT;
if (setsockopt (sock, IPPROTO_IP, IP_PORTRANGE, &on, setsockopt (sock, IPPROTO_IP, IP_PORTRANGE, &on, sizeof(on));
sizeof(on)) < 0)
warn ("setsockopt IP_PORTRANGE (ignored)");
} }
#endif #endif
#if defined(IPV6_PORTRANGE) #if defined(IPV6_PORTRANGE)
if (af == AF_INET6) { if (af == AF_INET6) {
int on = restr ? IPV6_PORTRANGE_HIGH : int on = restr ? IPV6_PORTRANGE_HIGH : IPV6_PORTRANGE_DEFAULT;
IPV6_PORTRANGE_DEFAULT; setsockopt (sock, IPPROTO_IPV6, IPV6_PORTRANGE, &on, sizeof(on));
if (setsockopt (sock, IPPROTO_IPV6, IPV6_PORTRANGE, &on,
sizeof(on)) < 0)
warn ("setsockopt IPV6_PORTRANGE (ignored)");
} }
#endif #endif
} }
@@ -252,9 +243,7 @@ socket_set_debug (rk_socket_t sock)
{ {
#if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT) #if defined(SO_DEBUG) && defined(HAVE_SETSOCKOPT)
int on = 1; int on = 1;
setsockopt (sock, SOL_SOCKET, SO_DEBUG, (void *) &on, sizeof (on));
if (setsockopt (sock, SOL_SOCKET, SO_DEBUG, (void *) &on, sizeof (on)) < 0)
warn ("setsockopt SO_DEBUG (ignored)");
#endif #endif
} }
@@ -266,9 +255,7 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
socket_set_tos (rk_socket_t sock, int tos) socket_set_tos (rk_socket_t sock, int tos)
{ {
#if defined(IP_TOS) && defined(HAVE_SETSOCKOPT) #if defined(IP_TOS) && defined(HAVE_SETSOCKOPT)
if (setsockopt (sock, IPPROTO_IP, IP_TOS, (void *) &tos, sizeof (int)) < 0) setsockopt (sock, IPPROTO_IP, IP_TOS, (void *) &tos, sizeof(int));
if (errno != EINVAL)
warn ("setsockopt TOS (ignored)");
#endif #endif
} }
@@ -280,9 +267,7 @@ ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
socket_set_reuseaddr (rk_socket_t sock, int val) socket_set_reuseaddr (rk_socket_t sock, int val)
{ {
#if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT) #if defined(SO_REUSEADDR) && defined(HAVE_SETSOCKOPT)
if(setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&val, setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *)&val, sizeof(val));
sizeof(val)) < 0)
err (1, "setsockopt SO_REUSEADDR");
#endif #endif
} }