X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/97ad99cc23c5f0007de461afb200fd83c3d20481..c1d1c2a8c4f22c3911d392393072327b0e319c5e:/icmp.c diff --git a/icmp.c b/icmp.c index e0913ab..fa947b7 100644 --- a/icmp.c +++ b/icmp.c @@ -1,7 +1,5 @@ // L2TPNS: icmp -char const *cvs_id_icmp = "$Id: icmp.c,v 1.7 2005/01/25 04:19:05 bodea Exp $"; - #include #include #include @@ -17,8 +15,9 @@ char const *cvs_id_icmp = "$Id: icmp.c,v 1.7 2005/01/25 04:19:05 bodea Exp $"; #include #include "l2tpns.h" +#include "pppoe.h" -static uint16_t _checksum(unsigned char *addr, int count); +static uint16_t _checksum(uint8_t *addr, int count); struct ipv6_pseudo_hdr { struct in6_addr src; @@ -28,12 +27,11 @@ struct ipv6_pseudo_hdr { uint32_t nexthdr : 8; }; -void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char *packet, int packet_len) +void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, uint8_t *packet, int packet_len) { char buf[128] = {0}; struct iphdr *iph; struct icmphdr *icmp; - char *data; int len = 0, on = 1, icmp_socket; struct sockaddr_in whereto = {0}; @@ -49,9 +47,13 @@ void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char len = sizeof(struct iphdr); icmp = (struct icmphdr *)(buf + len); len += sizeof(struct icmphdr); - data = (char *)(buf + len); - len += (packet_len < 64) ? packet_len : 64; - memcpy(data, packet, (packet_len < 64) ? packet_len : 64); + + /* ip header + first 8 bytes of payload */ + if (packet_len > (sizeof(struct iphdr) + 8)) + packet_len = sizeof(struct iphdr) + 8; + + memcpy(buf + len, packet, packet_len); + len += packet_len; iph->tos = 0; iph->id = id; @@ -69,15 +71,15 @@ void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char icmp->type = ICMP_DEST_UNREACH; icmp->code = ICMP_HOST_UNREACH; - icmp->checksum = _checksum((char *) icmp, sizeof(struct icmphdr) + ((packet_len < 64) ? packet_len : 64)); + icmp->checksum = _checksum((uint8_t *) icmp, sizeof(struct icmphdr) + packet_len); - iph->check = _checksum((char *) iph, sizeof(struct iphdr)); + iph->check = _checksum((uint8_t *) iph, sizeof(struct iphdr)); - sendto(icmp_socket, (char *)buf, len, 0, (struct sockaddr *)&whereto, sizeof(struct sockaddr)); + sendto(icmp_socket, buf, len, 0, (struct sockaddr *)&whereto, sizeof(struct sockaddr)); close(icmp_socket); } -static uint16_t _checksum(unsigned char *addr, int count) +static uint16_t _checksum(uint8_t *addr, int count) { register long sum = 0; @@ -99,7 +101,7 @@ static uint16_t _checksum(unsigned char *addr, int count) return htons((uint16_t) sum); } -void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip) +void send_ipv6_ra(sessionidt s, tunnelidt t, struct in6_addr *ip) { struct nd_opt_prefix_info *pinfo; struct ipv6_pseudo_hdr *phdr; @@ -111,7 +113,7 @@ void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip) LOG(3, s, t, "Sending IPv6 RA\n"); memset(b, 0, sizeof(b)); - o = makeppp(b, sizeof(b), 0, 0, t, s, PPPIPV6); + o = makeppp(b, sizeof(b), 0, 0, s, t, PPPIPV6, 0, 0, 0); if (!o) { @@ -129,7 +131,9 @@ void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip) *(o+9) = 0x80; *(o+23) = 1; if (ip != NULL) + { memcpy(o+24, ip, 16); // dest = ip + } else { // FF02::1 - all hosts