From: fendo Date: Wed, 1 Oct 2014 22:28:57 +0000 (+0200) Subject: Add of the RDNSS option to ICMPv6 Router Advertisement (RA). X-Git-Tag: 2.2.1-2fdn3.17 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/9c77145f71b0e669421d00ae0b34680f875121ae?ds=sidebyside;hp=cd77c8bedb442b879ce317f06ea0954b0fc2e9a0 Add of the RDNSS option to ICMPv6 Router Advertisement (RA). --- diff --git a/debian/changelog b/debian/changelog index e3b5193..565c153 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +l2tpns (2.2.1-2fdn3.17) unstable; urgency=low + + * Add of the RDNSS option to ICMPv6 Router Advertisement (RA). + + -- Fernando Alves Thu, 02 Oct 2014 00:24:31 +0200 + l2tpns (2.2.1-2fdn3.16) unstable; urgency=low * Fix: IPv6 prefix routing on slave cluster diff --git a/icmp.c b/icmp.c index d2f53e0..58c28f2 100644 --- a/icmp.c +++ b/icmp.c @@ -87,11 +87,21 @@ static uint16_t _checksum(uint8_t *addr, int count) return htons((uint16_t) sum); } +struct nd_opt_rdnss_info_l2tpns +{ + uint8_t nd_opt_rdnssi_type; + uint8_t nd_opt_rdnssi_len; + uint16_t nd_opt_rdnssi_pref_flag_reserved; + uint32_t nd_opt_rdnssi_lifetime; + struct in6_addr nd_opt_rdnssi[0]; +}; + void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip) { struct nd_opt_prefix_info *pinfo; struct ip6_hdr *p_ip6_hdr; struct nd_router_advert *p_nra; + struct nd_opt_rdnss_info_l2tpns *p_rdnss; uint8_t b[MAXETHER + 20]; struct ipv6_pseudo_hdr pseudo_hdr; int l; @@ -151,19 +161,44 @@ void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip) else pinfo->nd_opt_pi_prefix = config->ipv6_prefix; - // // Length of payload (not header) - p_ip6_hdr->ip6_plen = htons(sizeof(*pinfo) + sizeof(*p_nra)); + // Length of payload (not header) + l = sizeof(*pinfo) + sizeof(*p_nra); + + if (config->default_ipv6_dns1.s6_addr32[0]) + { + struct in6_addr *ptr_in6_addr; + p_rdnss = (struct nd_opt_rdnss_info_l2tpns *) &pinfo[1]; + + p_rdnss->nd_opt_rdnssi_type = 25; //RDNSS OPTION INFORMATION; + p_rdnss->nd_opt_rdnssi_len = 3; // 1 + 2 * nb DNS + p_rdnss->nd_opt_rdnssi_lifetime = htonl(config->dns6_lifetime); + ptr_in6_addr = &p_rdnss->nd_opt_rdnssi[0]; + memcpy(ptr_in6_addr, &config->default_ipv6_dns1, sizeof(*ptr_in6_addr)); + + l += sizeof(*p_rdnss) + sizeof(*ptr_in6_addr); + if (config->default_ipv6_dns2.s6_addr32[0]) + { + ptr_in6_addr = &p_rdnss->nd_opt_rdnssi[1]; + memcpy(ptr_in6_addr, &config->default_ipv6_dns2, sizeof(*ptr_in6_addr)); + p_rdnss->nd_opt_rdnssi_len += 2; // 1 + 2 * nb DNS + l += sizeof(*ptr_in6_addr); + } + } - l = sizeof(*pinfo) + sizeof(*p_nra) + sizeof(*p_ip6_hdr); + // Length of payload (not header) + p_ip6_hdr->ip6_plen = htons(l); /* Use pseudo hearder for checksum calculation */ memset(&pseudo_hdr, 0, sizeof(pseudo_hdr)); memcpy(&pseudo_hdr.src, &p_ip6_hdr->ip6_src, 16); memcpy(&pseudo_hdr.dest, &p_ip6_hdr->ip6_dst, 16); - pseudo_hdr.ulp_length = htonl(sizeof(*pinfo) + sizeof(*p_nra)); // Lenght whitout Ipv6 header + pseudo_hdr.ulp_length = htonl(l); // Lenght whitout Ipv6 header pseudo_hdr.nexthdr = IPPROTO_ICMPV6; // Checksum is over the icmp6 payload plus the pseudo header - p_nra->nd_ra_cksum = ipv6_checksum(&pseudo_hdr, (uint8_t *) p_nra, (sizeof(*pinfo) + sizeof(*p_nra))); + p_nra->nd_ra_cksum = ipv6_checksum(&pseudo_hdr, (uint8_t *) p_nra, l); + + // Length + hearder length + l += sizeof(*p_ip6_hdr); tunnelsend(b, l + (((uint8_t *) p_ip6_hdr)-b), t); // send it... return; diff --git a/l2tpns.c b/l2tpns.c index 14892f7..114981f 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -194,6 +194,7 @@ config_descriptt config_values[] = { CONFIG("dhcp6_preferred_lifetime", dhcp6_preferred_lifetime, INT), CONFIG("dhcp6_valid_lifetime", dhcp6_valid_lifetime, INT), CONFIG("dhcp6_server_duid", dhcp6_server_duid, INT), + CONFIG("dns6_lifetime", dns6_lifetime, INT), CONFIG("primary_ipv6_dns", default_ipv6_dns1, IPv6), CONFIG("secondary_ipv6_dns", default_ipv6_dns2, IPv6), CONFIG("default_ipv6_domain_list", default_ipv6_domain_list, STRING), @@ -4599,6 +4600,8 @@ static void initdata(int optdebug, char *optconfig) // Set default value echo_timeout and idle_echo_timeout config->echo_timeout = ECHO_TIMEOUT; config->idle_echo_timeout = IDLE_ECHO_TIMEOUT; + // Set default RDNSS lifetime + config->dns6_lifetime = 1200; log_stream = stderr; diff --git a/l2tpns.h b/l2tpns.h index fdfaa62..c4487ff 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -808,6 +808,7 @@ typedef struct uint32_t dhcp6_preferred_lifetime; // preferred lifetime (see rfc3315) uint32_t dhcp6_valid_lifetime; // valid lifetime (see rfc3315) uint32_t dhcp6_server_duid; // DUID of dhcpv6 server (see rfc3315) + uint32_t dns6_lifetime; // RDNSS lifetime default 1200 (see rfc6106, rfc4861) (MaxRtrAdvInterval <= Lifetime <= 2*MaxRtrAdvInterval) char default_ipv6_domain_list[255]; } configt;