projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Warning: dereferencing type-punned pointer will break strict...
[l2tpns.git]
/
arp.c
diff --git
a/arp.c
b/arp.c
index
05929cd
..
6d55756
100644
(file)
--- a/
arp.c
+++ b/
arp.c
@@
-1,3
+1,5
@@
+// L2TPNS: arp
+
#include <string.h>
#include <unistd.h>
#include <net/ethernet.h>
#include <string.h>
#include <unistd.h>
#include <net/ethernet.h>
@@
-14,17
+16,20
@@
struct arp_buf {
/* Data bit - variably sized, so not present in |struct arphdr| */
unsigned char ar_sha[ETH_ALEN]; /* Sender hardware address */
/* Data bit - variably sized, so not present in |struct arphdr| */
unsigned char ar_sha[ETH_ALEN]; /* Sender hardware address */
- i
pt ar_sip;
/* Sender IP address. */
+ i
n_addr_t ar_sip;
/* Sender IP address. */
unsigned char ar_tha[ETH_ALEN]; /* Target hardware address */
unsigned char ar_tha[ETH_ALEN]; /* Target hardware address */
- i
pt ar_tip;
/* Target ip */
+ i
n_addr_t ar_tip;
/* Target ip */
} __attribute__((packed));
} __attribute__((packed));
-void sendarp(int ifr_idx, const unsigned char* mac, i
p
t ip)
+void sendarp(int ifr_idx, const unsigned char* mac, i
n_addr_
t ip)
{
int fd;
struct sockaddr_ll sll;
struct arp_buf buf;
{
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);
/* Ethernet */
memset(buf.eth.ether_dhost, 0xFF, ETH_ALEN);
memcpy(buf.eth.ether_shost, mac, ETH_ALEN);
@@
-48,7
+53,7
@@
void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
memset(&sll, 0, sizeof(sll));
sll.sll_family = AF_PACKET;
memset(&sll, 0, sizeof(sll));
sll.sll_family = AF_PACKET;
-
strn
cpy(sll.sll_addr, mac, sizeof(sll.sll_addr) - 1);
+
mem
cpy(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;