Update Changelog

[l2tpns.git] / icmp.c

diff --git a/icmp.c b/icmp.c
index f6c3e0d..5f05127 100644 (file)
--- a/icmp.c
+++ b/icmp.c
@@ -1,7 +1,5 @@
 // L2TPNS: icmp
 
 // L2TPNS: icmp
 

-char const *cvs_id_icmp = "$Id: icmp.c,v 1.7 2005-01-25 04:19:05 bodea Exp $";
-

 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>


@@ -15,10 +13,12 @@ char const *cvs_id_icmp = "$Id: icmp.c,v 1.7 2005-01-25 04:19:05 bodea Exp $";
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <memory.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <memory.h>

+#include <linux/rtnetlink.h>

 
 #include "l2tpns.h"
 
 #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;
 
 struct ipv6_pseudo_hdr {
        struct in6_addr src;


@@ -28,12 +28,11 @@ struct ipv6_pseudo_hdr {
        uint32_t nexthdr :  8;
 };
 
        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 buf[128] = {0};
        struct iphdr *iph;
        struct icmphdr *icmp;

-       char *data;

        int len = 0, on = 1, icmp_socket;
        struct sockaddr_in whereto = {0};
 
        int len = 0, on = 1, icmp_socket;
        struct sockaddr_in whereto = {0};
 


@@ -49,9 +48,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);
        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;
 
        iph->tos = 0;
        iph->id = id;


@@ -69,15 +72,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->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);
 }
 
        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;
 
 {
        register long sum = 0;
 


@@ -99,7 +102,7 @@ static uint16_t _checksum(unsigned char *addr, int count)
        return htons((uint16_t) sum);
 }
 
        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;
 {
        struct nd_opt_prefix_info *pinfo;
        struct ipv6_pseudo_hdr *phdr;


@@ -111,7 +114,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));
        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)
        {
 
        if (!o)
        {


@@ -129,7 +132,9 @@ void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip)
        *(o+9) = 0x80;
        *(o+23) = 1;
        if (ip != NULL)
        *(o+9) = 0x80;
        *(o+23) = 1;
        if (ip != NULL)

+       {

                memcpy(o+24, ip, 16);   // dest = ip
                memcpy(o+24, ip, 16);   // dest = ip

+       }

        else
        {
                // FF02::1 - all hosts
        else
        {
                // FF02::1 - all hosts