welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate out DHCP processing

Browse source 
So we can later call it on UDP datagrams obtained from UDP socket.
This commit is contained in:
Samuel Thibault 2023-05-17 23:42:08 +02:00
parent e53fccd36c
commit c3eb1be0b4
5 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

53
dhcp6.c
View file

@ -29,7 +29,7 @@ static struct dhcp6_in_option list_option;
static int dhcpv6_format_dns_search_name(const char *strdns, uint8_t *buffer);
static void dhcp6_send_reply(sessionidt s, tunnelidt t, struct in6_addr *ip6_src)
static void dhcp6_send_reply(sessionidt s, tunnelidt t, const struct in6_addr *ip6_src)
{
struct ip6_hdr *p_ip6_hdr;
struct udphdr *p_udp;
@ -309,26 +309,22 @@ static char * get_msg_type(uint8_t type)
}
}
void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
void dhcpv6_process(sessionidt s, tunnelidt t, const struct in6_addr *addr, uint8_t *p, uint16_t l)
{
struct ip6_hdr *p_ip6_hdr_in;
struct dhcp6_mess_hdr *p_mess_hdr;
struct dhcp6_mess_hdr *p_mess_hdr = (struct dhcp6_mess_hdr *) p;
struct dhcp6_opt_h *p_opt;
uint8_t *p_end;
uint16_t len;
CSTAT(dhcpv6_process);
p_ip6_hdr_in = (struct ip6_hdr *) p;
p_mess_hdr = (struct dhcp6_mess_hdr *) (p + 48);
LOG(3, s, t, "Got DHCPv6 message Type: %s(%d)\n", get_msg_type(p_mess_hdr->type), p_mess_hdr->type);
if (!session[s].route6[0].ipv6route.s6_addr[0] || !session[s].route6[0].ipv6prefixlen)
return;
p_opt = (struct dhcp6_opt_h *) &p_mess_hdr[1];
p_end = ((uint8_t *)p_ip6_hdr_in) + ntohs(p_ip6_hdr_in->ip6_plen) + sizeof(*p_ip6_hdr_in);
p_end = p + l;
memset(&list_option, 0, sizeof(list_option));
list_option.p_mess_hdr = p_mess_hdr;
while (((uint8_t *)p_opt) < p_end)
@ -413,7 +409,7 @@ void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
return;
}
dhcp6_send_reply(s, t, &p_ip6_hdr_in->ip6_src);
dhcp6_send_reply(s, t, addr);
}
break;
@ -458,8 +454,8 @@ void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
return;
}
dhcp6_send_reply(s, t, &p_ip6_hdr_in->ip6_src);
send_ipv6_ra(s, t, &p_ip6_hdr_in->ip6_src); // send a RA
dhcp6_send_reply(s, t, addr);
send_ipv6_ra(s, t, addr); // send a RA
}
break;
@ -489,7 +485,7 @@ void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
return;
}
dhcp6_send_reply(s, t, &p_ip6_hdr_in->ip6_src);
dhcp6_send_reply(s, t, addr);
}
break;
@ -501,7 +497,7 @@ void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
return;
}
dhcp6_send_reply(s, t, &p_ip6_hdr_in->ip6_src);
dhcp6_send_reply(s, t, addr);
}
break;
@ -527,6 +523,37 @@ void dhcpv6_process(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
return;
}
void dhcpv6_process_from_ipv6(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
{
struct ip6_hdr *p_ip6_hdr_in = (struct ip6_hdr *) p;
struct in6_addr *addr = &p_ip6_hdr_in->ip6_src;
uint16_t ipv6_len = ntohs(p_ip6_hdr_in->ip6_plen);
l -= sizeof(*p_ip6_hdr_in);
p += sizeof(*p_ip6_hdr_in);
if (ipv6_len > l)
{
LOG(5, 0, 0, "bogus IPv6 packet size??\n");
return;
}
if (p_ip6_hdr_in->ip6_nxt != 17)
{
LOG(5, 0, 0, "not UDP DHCP packet??\n");
return;
}
if (ipv6_len < sizeof(struct udphdr))
{
LOG(5, 0, 0, "bogus IPv6 packet size for UDP??\n");
return;
}
ipv6_len -= sizeof(struct udphdr);
p += sizeof(struct udphdr);
dhcpv6_process(s, t, addr, p, ipv6_len);
}
static int dhcpv6_format_dns_search_name(const char *strdns, uint8_t *buffer)
{
int n = strlen(strdns);