clean up paths

[l2tpns.git] / arp.c

diff --git a/arp.c b/arp.c
index 122880a..78ba856 100644 (file)
--- a/arp.c
+++ b/arp.c
@@ -1,3 +1,7 @@
+// 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 <string.h>
 #include <unistd.h>
 #include <net/ethernet.h>


@@ -25,6 +29,9 @@ void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
        struct sockaddr_ll sll;
        struct arp_buf buf;
 
        struct sockaddr_ll sll;
        struct arp_buf buf;
 

+       CSTAT(call_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);


@@ -42,15 +49,16 @@ void sendarp(int ifr_idx, const unsigned char* mac, ipt ip)
        memcpy(&buf.ar_sip, &ip, sizeof(ip));
        memcpy(buf.ar_tha, mac, ETH_ALEN);
        memcpy(&buf.ar_tip, &ip, sizeof(ip));
        memcpy(&buf.ar_sip, &ip, sizeof(ip));
        memcpy(buf.ar_tha, mac, ETH_ALEN);
        memcpy(&buf.ar_tip, &ip, sizeof(ip));

-       
+

        /* Now actually send the thing */
        fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_RARP));
 
        memset(&sll, 0, sizeof(sll));
        sll.sll_family = AF_PACKET;
        /* Now actually send the thing */
        fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_RARP));
 
        memset(&sll, 0, sizeof(sll));
        sll.sll_family = AF_PACKET;

-       strncpy(sll.sll_addr, mac, sizeof(sll.sll_addr)); /* Null-pad */
+       strncpy(sll.sll_addr, mac, sizeof(sll.sll_addr) - 1);

        sll.sll_halen = ETH_ALEN;
        sll.sll_ifindex = ifr_idx;
 
        sendto(fd, &buf, sizeof(buf), 0, (struct sockaddr*)&sll, sizeof(sll));
        sll.sll_halen = ETH_ALEN;
        sll.sll_ifindex = ifr_idx;
 
        sendto(fd, &buf, sizeof(buf), 0, (struct sockaddr*)&sll, sizeof(sll));

+       close(fd);

 }
 }