From ffbb2d559af42ddb38f315ce0f5f9f70204e1037 Mon Sep 17 00:00:00 2001 From: Richard Patterson Date: Mon, 19 Aug 2024 17:26:52 +0100 Subject: [PATCH] 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 --- src/dhcpv6.c | 4 ---- src/odhcp6c.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/dhcpv6.c b/src/dhcpv6.c index c1603f5..5bf1ff4 100644 --- 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 7904946..518193e 100644 --- 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, -- 2.30.2