Fix socket creation in host_unreachable() (thanks to Bjørn Augestad)

diff --git a/Changes b/Changes
index 0d6ee8d..5ac335f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+* ? Brendan O'Dea <bod@optusnet.com.au> 2.0.7
+- Fix socket creation in host_unreachable() (thanks to Bjørn Augestad)
+

 * Thu Nov 11 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.6
 - Make BGP keepalive/hold time configurable
 - Revise BGP config to use "router bgp AS" syntax (requires libcli >= 1.8.2)
 * Thu Nov 11 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.6
 - Make BGP keepalive/hold time configurable
 - Revise BGP config to use "router bgp AS" syntax (requires libcli >= 1.8.2)

diff --git a/icmp.c b/icmp.c
index 853d665..3937961 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.4 2004-11-15 02:26:20 bodea Exp $";

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


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