X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c7983582eaeac8f1e2a66cbff6bdb20aeb58ad8e..eef4a6a9429c38bfc2293a34593922ccb8bb20c7:/arp.c?ds=sidebyside diff --git a/arp.c b/arp.c index 4434364..111f973 100644 --- a/arp.c +++ b/arp.c @@ -1,13 +1,14 @@ // L2TPNS: arp -char const *cvs_id_arp = "$Id: arp.c,v 1.4 2004/07/08 16:19:09 bodea Exp $"; - #include #include #include #include #include +#include +#include +#include "dhcp6.h" #include "l2tpns.h" /* Most of this code is based on keepalived:vrrp_arp.c */ @@ -18,18 +19,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 +56,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;