This commit is contained in:
Samuel Thibault 2024-01-18 02:39:32 +01:00
parent 0adfa09090
commit 1d19366e15
3 changed files with 4 additions and 4 deletions

View file

@ -254,7 +254,7 @@ static void dhcp6_send_reply(sessionidt s, tunnelidt t, struct in6_addr *ip6_src
len = ((uint8_t *) p_opt) - ((uint8_t *) p_udp); len = ((uint8_t *) p_opt) - ((uint8_t *) p_udp);
p_ip6_hdr->ip6_plen = p_udp->len = htons(len); p_ip6_hdr->ip6_plen = p_udp->len = htons(len);
/* Use pseudo hearder for checksum calculation */ /* Use pseudo-header for checksum calculation */
memset(&pseudo_hdr, 0, sizeof(pseudo_hdr)); memset(&pseudo_hdr, 0, sizeof(pseudo_hdr));
memcpy(&pseudo_hdr.src, &p_ip6_hdr->ip6_src, 16); memcpy(&pseudo_hdr.src, &p_ip6_hdr->ip6_src, 16);
memcpy(&pseudo_hdr.dest, &p_ip6_hdr->ip6_dst, 16); memcpy(&pseudo_hdr.dest, &p_ip6_hdr->ip6_dst, 16);

4
icmp.c
View file

@ -188,7 +188,7 @@ void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip)
// Length of payload (not header) // Length of payload (not header)
p_ip6_hdr->ip6_plen = htons(l); p_ip6_hdr->ip6_plen = htons(l);
/* Use pseudo hearder for checksum calculation */ /* Use pseudo-header for checksum calculation */
memset(&pseudo_hdr, 0, sizeof(pseudo_hdr)); memset(&pseudo_hdr, 0, sizeof(pseudo_hdr));
memcpy(&pseudo_hdr.src, &p_ip6_hdr->ip6_src, 16); memcpy(&pseudo_hdr.src, &p_ip6_hdr->ip6_src, 16);
memcpy(&pseudo_hdr.dest, &p_ip6_hdr->ip6_dst, 16); memcpy(&pseudo_hdr.dest, &p_ip6_hdr->ip6_dst, 16);
@ -197,7 +197,7 @@ void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip)
// Checksum is over the icmp6 payload plus the pseudo header // Checksum is over the icmp6 payload plus the pseudo header
p_nra->nd_ra_cksum = ipv6_checksum(&pseudo_hdr, (uint8_t *) p_nra, l); p_nra->nd_ra_cksum = ipv6_checksum(&pseudo_hdr, (uint8_t *) p_nra, l);
// Length + hearder length // Length + header length
l += sizeof(*p_ip6_hdr); l += sizeof(*p_ip6_hdr);
tunnelsend(b, l + (((uint8_t *) p_ip6_hdr)-b), t); // send it... tunnelsend(b, l + (((uint8_t *) p_ip6_hdr)-b), t); // send it...

View file

@ -4115,7 +4115,7 @@ static void mainloop(void)
{ {
int i, j; int i, j;
uint8_t buf[65536]; uint8_t buf[65536];
uint8_t *p = buf + 32; // for the hearder of the forwarded MPPP packet (see C_MPPP_FORWARD) uint8_t *p = buf + 32; // for the header of the forwarded MPPP packet (see C_MPPP_FORWARD)
// and the forwarded pppoe session // and the forwarded pppoe session
int size_bufp = sizeof(buf) - 32; int size_bufp = sizeof(buf) - 32;
clockt next_cluster_ping = 0; // send initial ping immediately clockt next_cluster_ping = 0; // send initial ping immediately