X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/fc0a36320874bea43b9fd73df0e0990bfd3b59cd..3b6cfeb9a24f60d0cbfd83456124142594f3414a:/arp.c?ds=sidebyside diff --git a/arp.c b/arp.c index 05929cd..e9c7584 100644 --- a/arp.c +++ b/arp.c @@ -1,8 +1,12 @@ +// L2TPNS: arp + #include #include #include #include #include +#include +#include #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); @@ -48,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;