reinstate sendccp as initccp; send only once

[l2tpns.git] / icmp.c

diff --git a/icmp.c b/icmp.c
index 0a56740..0a50c39 100644 (file)
--- a/icmp.c
+++ b/icmp.c
@@ -1,6 +1,11 @@
+// L2TPNS: icmp
+
+char const *cvs_id_icmp = "$Id: icmp.c,v 1.5 2004/11/16 07:54:32 bodea Exp $";
+

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

+#include <asm/types.h>

 #include <linux/ip.h>
 #include <linux/icmp.h>
 #include <stdio.h>
 #include <linux/ip.h>
 #include <linux/icmp.h>
 #include <stdio.h>


@@ -9,11 +14,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <memory.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <memory.h>

-#include "l2tpns.h"

 
 

-extern ipt myip;
+#include "l2tpns.h"

 
 

-__u16 _checksum(unsigned char *addr, int count);
+static __u16 _checksum(unsigned char *addr, int count);

 
 void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len)
 {
 
 void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len)
 {


@@ -24,8 +28,9 @@ void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int pac
        int len = 0, on = 1, icmp_socket;
        struct sockaddr_in whereto = {0};
 
        int len = 0, on = 1, icmp_socket;
        struct sockaddr_in whereto = {0};
 

-       if (!(icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)))
+       if ((icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0)

                return;
                return;

+

        setsockopt(icmp_socket, IPPROTO_IP, IP_HDRINCL, (char *)&on, sizeof(on));
 
        whereto.sin_addr.s_addr = destination;
        setsockopt(icmp_socket, IPPROTO_IP, IP_HDRINCL, (char *)&on, sizeof(on));
 
        whereto.sin_addr.s_addr = destination;


@@ -63,7 +68,7 @@ void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int pac
        close(icmp_socket);
 }
 
        close(icmp_socket);
 }
 

-__u16 _checksum(unsigned char *addr, int count)
+static __u16 _checksum(unsigned char *addr, int count)

 {
        register long sum = 0;
 
 {
        register long sum = 0;