odhcp6c: Do not request S46 OROs by default

This prevents odhcp6c from requesting MAP-T/E, LW4o6, and DS-Lite options by default, as the required packages aren't installed by default.

This commit should be merged along with commits to the map and ds-lite packages, that add configuration to requests the OROs when the packages are install

Signed-off-by: Richard Patterson <richard@helix.net.nz>

diff --git a/src/dhcpv6.c b/src/dhcpv6.c
index c1603f5bccbc29fa745c6fba8b3facf80a990ddb..5bf1ff46ec85657aafebd1c0ee3e27fb0ba8817c 100644 (file)
--- a/src/dhcpv6.c
+++ b/src/dhcpv6.c
@@ -256,14 +256,10 @@ int init_dhcpv6(const char *ifname, unsigned int options, int sk_prio, int sol_t
                        htons(DHCPV6_OPT_DNS_DOMAIN),
                        htons(DHCPV6_OPT_SNTP_SERVERS),
                        htons(DHCPV6_OPT_NTP_SERVER),
-                       htons(DHCPV6_OPT_AFTR_NAME),
                        htons(DHCPV6_OPT_PD_EXCLUDE),
 #ifdef EXT_CER_ID
                        htons(DHCPV6_OPT_CER_ID),
 #endif
-                       htons(DHCPV6_OPT_S46_CONT_MAPE),
-                       htons(DHCPV6_OPT_S46_CONT_MAPT),
-                       htons(DHCPV6_OPT_S46_CONT_LW),
                };
                odhcp6c_add_state(STATE_ORO, oro, sizeof(oro));
        }

diff --git a/src/odhcp6c.h b/src/odhcp6c.h
index 7904946f031cd65dcc5f8a8d78842f72ab9626dc..518193e5b5981eeb15c18d2cafd0347f2e25c975 100644 (file)
--- a/src/odhcp6c.h
+++ b/src/odhcp6c.h
@@ -88,7 +88,7 @@ enum dhcvp6_opt {
        DHCPV6_OPT_CER_ID = EXT_CER_ID,
 #endif
        DHCPV6_OPT_DHCPV4_MSG = 87,
-       /* draft-ietf-softwire-map-dhcp-08 */
+       /* RFC 7598 */
        DHCPV6_OPT_S46_RULE = 89,
        DHCPV6_OPT_S46_BR = 90,
        DHCPV6_OPT_S46_DMR = 91,