X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c5e4c2cfc092317c1e3ceb0f654f880f6a8573f4..e7c9a1993778e9ac375d7f956dda7c3c802a83a5:/arp.c?ds=inline

diff --git a/arp.c b/arp.c
index 122880a..e9c7584 100644
--- a/arp.c
+++ b/arp.c
@@ -1,8 +1,12 @@
+// L2TPNS: arp
+
 #include <string.h>
 #include <unistd.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_packet.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
 
 #include "l2tpns.h"
 
@@ -14,17 +18,20 @@ struct arp_buf {
 
 	/* Data bit - variably sized, so not present in |struct arphdr| */
 	unsigned char ar_sha[ETH_ALEN];	/* Sender hardware address */
-	ipt ar_sip;			/* Sender IP address. */
+	in_addr_t ar_sip;		/* Sender IP address. */
 	unsigned char ar_tha[ETH_ALEN]; /* Target hardware address */
-	ipt ar_tip;			/* Target ip */
+	in_addr_t ar_tip;		/* Target ip */
 } __attribute__((packed));
 
-void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
+void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip)
 {
 	int fd;
 	struct sockaddr_ll sll;
 	struct arp_buf buf;
 
+	CSTAT(sendarp);
+	STAT(arp_sent);
+
 	/* Ethernet */
 	memset(buf.eth.ether_dhost, 0xFF, ETH_ALEN);
 	memcpy(buf.eth.ether_shost, mac, ETH_ALEN);
@@ -42,15 +49,16 @@ void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
 	memcpy(&buf.ar_sip, &ip, sizeof(ip));
 	memcpy(buf.ar_tha, mac, ETH_ALEN);
 	memcpy(&buf.ar_tip, &ip, sizeof(ip));
-	
+
 	/* Now actually send the thing */
 	fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_RARP));
 
 	memset(&sll, 0, sizeof(sll));
 	sll.sll_family = AF_PACKET;
-	strncpy(sll.sll_addr, mac, sizeof(sll.sll_addr)); /* Null-pad */
+	memcpy(sll.sll_addr, mac, sizeof(sll.sll_addr) - 1);
 	sll.sll_halen = ETH_ALEN;
 	sll.sll_ifindex = ifr_idx;
 
 	sendto(fd, &buf, sizeof(buf), 0, (struct sockaddr*)&sll, sizeof(sll));
+	close(fd);
 }