Merge from Master

[l2tpns.git] / arp.c

diff --git a/arp.c b/arp.c
index 55c8777..111f973 100644 (file)
--- a/arp.c
+++ b/arp.c
@@ -1,13 +1,14 @@
 // L2TPNS: arp
 
 // L2TPNS: arp
 

-char const *cvs_id_arp = "$Id: arp.c,v 1.6 2005/01/07 07:14:14 bodea Exp $";
-

 #include <string.h>
 #include <unistd.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_packet.h>
 #include <string.h>
 #include <unistd.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_packet.h>

+#include <linux/rtnetlink.h>
+#include <netinet/ip6.h>

 
 

+#include "dhcp6.h"

 #include "l2tpns.h"
 
 /* Most of this code is based on keepalived:vrrp_arp.c */
 #include "l2tpns.h"
 
 /* Most of this code is based on keepalived:vrrp_arp.c */


@@ -55,7 +56,7 @@ void sendarp(int ifr_idx, const unsigned char* mac, in_addr_t ip)
 
        memset(&sll, 0, sizeof(sll));
        sll.sll_family = AF_PACKET;
 
        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;
 
        sll.sll_halen = ETH_ALEN;
        sll.sll_ifindex = ifr_idx;