summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2011-11-10 18:17:00 +0800
committerMatt Johnston <matt@ucc.asn.au>2011-11-10 18:17:00 +0800
commitd5cd43cf7d50156082419abbab128b139497c28d (patch)
treeff4e22b9dfa84384956e0b1d27f6708c2dfacf4d
parenta3373a20760422bcea57ef4873203fa000070c81 (diff)
downloaddropbear-d5cd43cf7d50156082419abbab128b139497c28d.tar.gz
Put better #if guards around IPv6 socket options for IPV6_TCLASS and
IPV6_V6ONLY. From Gustavo Zacarias.
-rw-r--r--dbutil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dbutil.c b/dbutil.c
index 39804ce..8823ab6 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -164,7 +164,7 @@ static void set_sock_priority(int sock) {
/* set the TOS bit for either ipv4 or ipv6 */
#ifdef IPTOS_LOWDELAY
val = IPTOS_LOWDELAY;
-#ifdef IPPROTO_IPV6
+#if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&val, sizeof(val));
#endif
setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
@@ -256,7 +256,7 @@ int dropbear_listen(const char* address, const char* port,
linger.l_linger = 5;
setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
-#ifdef IPV6_V6ONLY
+#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
if (res->ai_family == AF_INET6) {
int on = 1;
if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,