X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c239d4b22829335fda98b66ce045a3f624436eeb..0a443cca73698f943ac84a300079f47478ea862e:/icmp.c

diff --git a/icmp.c b/icmp.c
index f7d73c6..a920553 100644
--- a/icmp.c
+++ b/icmp.c
@@ -1,3 +1,7 @@
+// L2TPNS: icmp
+
+char const *cvs_id_icmp = "$Id: icmp.c,v 1.6 2004-12-16 08:49:53 bodea Exp $";
+
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -13,9 +17,9 @@
 
 #include "l2tpns.h"
 
-__u16 _checksum(unsigned char *addr, int count);
+static uint16_t _checksum(unsigned char *addr, int count);
 
-void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int packet_len)
+void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char *packet, int packet_len)
 {
 	char buf[128] = {0};
 	struct iphdr *iph;
@@ -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};
 
-	if (!(icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)))
+	if ((icmp_socket = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0)
 		return;
+
 	setsockopt(icmp_socket, IPPROTO_IP, IP_HDRINCL, (char *)&on, sizeof(on));
 
 	whereto.sin_addr.s_addr = destination;
@@ -55,21 +60,21 @@ void host_unreachable(ipt destination, u16 id, ipt source, char *packet, int pac
 
 	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((char *) icmp, sizeof(struct icmphdr) + ((packet_len < 64) ? packet_len : 64));
 
-	iph->check = _checksum((char *)iph, sizeof(struct iphdr));
+	iph->check = _checksum((char *) iph, sizeof(struct iphdr));
 
 	sendto(icmp_socket, (char *)buf, len, 0, (struct sockaddr *)&whereto, sizeof(struct sockaddr));
 	close(icmp_socket);
 }
 
-__u16 _checksum(unsigned char *addr, int count)
+static uint16_t _checksum(unsigned char *addr, int count)
 {
 	register long sum = 0;
 
 	for (; count > 1; count -= 2)
 	{
-		sum += ntohs(*(u32 *)addr);
+		sum += ntohs(*(uint32_t *) addr);
 		addr += 2;
 	}
 
@@ -82,5 +87,5 @@ __u16 _checksum(unsigned char *addr, int count)
 	// one's complement the result
 	sum = ~sum;
 
-	return htons((u16) sum);
+	return htons((uint16_t) sum);
 }