summaryrefslogtreecommitdiff
path: root/src/dhcpv6.c
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-08-25 08:08:56 +0200
committerSteven Barth <steven@midlink.org>2014-08-25 08:08:56 +0200
commit0300fe7589a1701361735ac068e4b57bb1a1896f (patch)
tree4db9ca56c9c649827af7799141776f040f7bc229 /src/dhcpv6.c
parent6959336df6e667145c0670f4455ca59e81f89a34 (diff)
downloadodhcp6c-0300fe7589a1701361735ac068e4b57bb1a1896f.tar.gz
Enable softwire-support by defaultv1.0
Diffstat (limited to 'src/dhcpv6.c')
-rw-r--r--src/dhcpv6.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index aafd237..b7fccac 100644
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -179,11 +179,9 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sol_timeout)
#ifdef EXT_CER_ID
htons(DHCPV6_OPT_CER_ID),
#endif
-#ifdef EXT_S46
htons(DHCPV6_OPT_S46_CONT_MAPE),
htons(DHCPV6_OPT_S46_CONT_MAPT),
htons(DHCPV6_OPT_S46_CONT_LW),
-#endif
};
odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
}
@@ -1041,7 +1039,6 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
odhcp6c_add_state(STATE_CER, &cer_id->addr, sizeof(any));
passthru = false;
#endif
-#ifdef EXT_S46
} else if (otype == DHCPV6_OPT_S46_CONT_MAPT) {
odhcp6c_add_state(STATE_S46_MAPT, odata, olen);
passthru = false;
@@ -1054,7 +1051,6 @@ static int dhcpv6_handle_reply(enum dhcpv6_msg orig, _unused const int rc,
} else if (otype == DHCPV6_OPT_S46_CONT_LW) {
odhcp6c_add_state(STATE_S46_LW, odata, olen);
passthru = false;
-#endif
} else if (otype == DHCPV6_OPT_CLIENTID ||
otype == DHCPV6_OPT_SERVERID ||
otype == DHCPV6_OPT_IA_TA ||