allow - in filter names; include in "show session" output

[l2tpns.git] / icmp.c

diff --git a/icmp.c b/icmp.c
index 4775d49..0a50c39 100644 (file)
--- a/icmp.c
+++ b/icmp.c
@@ -1,6 +1,6 @@
 // L2TPNS: icmp
 
 // L2TPNS: icmp
 

-char const *cvs_id_icmp = "$Id: icmp.c,v 1.3 2004/06/28 02:43:13 fred_nerk Exp $";
+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 <arpa/inet.h>
 #include <netdb.h>


@@ -17,7 +17,7 @@ char const *cvs_id_icmp = "$Id: icmp.c,v 1.3 2004/06/28 02:43:13 fred_nerk Exp $
 
 #include "l2tpns.h"
 
 
 #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)
 {


@@ -28,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;


@@ -67,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;