X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c7983582eaeac8f1e2a66cbff6bdb20aeb58ad8e..916c13c6039bd189873ee094e9c0ebd010899792:/arp.c

diff --git a/arp.c b/arp.c
index 4434364..e9c7584 100644
--- a/arp.c
+++ b/arp.c
@@ -1,12 +1,12 @@
 // L2TPNS: arp
 
-char const *cvs_id_arp = "$Id: arp.c,v 1.4 2004/07/08 16:19:09 bodea Exp $";
-
 #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"
 
@@ -18,18 +18,18 @@ 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(call_sendarp);
+	CSTAT(sendarp);
 	STAT(arp_sent);
 
 	/* Ethernet */
@@ -55,7 +55,7 @@ void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
 
 	memset(&sll, 0, sizeof(sll));
 	sll.sll_family = AF_PACKET;
-	strncpy(sll.sll_addr, mac, sizeof(sll.sll_addr) - 1);
+	memcpy(sll.sll_addr, mac, sizeof(sll.sll_addr) - 1);
 	sll.sll_halen = ETH_ALEN;
 	sll.sll_ifindex = ifr_idx;