Changeset 1778 for trunk/src/common/sendpacket.c

Timestamp:

03/31/07 21:05:16 (22 months ago)

Author:

aturner

Message:

- fix stats report
- fix pcap_sendpacket() return on error
refs #137

Files:

• trunk/src/common/sendpacket.c (modified) (13 diffs)

trunk/src/common/sendpacket.c

@@ -81 +81 @@
 #include <errno.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -129 +130 @@
 static sendpacket_t *sendpacket_open_libnet(const char *, char *) __attribute__((unused));
 static struct tcpr_ether_addr *sendpacket_get_hwaddr_libnet(sendpacket_t *) __attribute__((unused));
-
 #endif /* HAVE_LIBNET */
 
@@ -175 +175 @@
         sendpacket_seterr(sp, "Error with pf send(): %s", strerror(errno));
     }
-    
+
 #elif defined HAVE_BPF
     retcode = write(sp->handle.fd, (void *)data, len);
@@ -184 +184 @@
         sendpacket_seterr(sp, "Error with bpf write(): %s", strerror(errno));
     }
-    
+
 #elif defined HAVE_LIBNET
     retcode = libnet_adv_write_link(sp->handle.lnet, (u_int8_t*)data, (u_int32_t)len);
@@ -194 +194 @@
     }
 
+#elif defined HAVE_PCAP_INJECT
     /* 
      * pcap methods don't seem to support ENOBUFS, so we just straight fail
      * is there a better way???
      */    
-#elif defined HAVE_PCAP_INJECT
-    if ((retcode = pcap_inject(sp->handle.pcap, (void*)data, len)) < 0)
-        sendpacket_seterr(sp, "Error with pcap_inject(): %s", pcap_geterr(sp->handle.pcap));
+    retcode = pcap_inject(sp->handle.pcap, (void*)data, len);
+    if (retcode < 0 && errno == ENOBUFS && !didsig) {
+        sp->retry ++;
+        goto TRY_SEND_AGAIN;
+    } else if (retcode < 0) {
+        sendpacket_seterr(sp, "Error with pcap_inject(packet " COUNTER_SPEC "): %s (%d)", 
+            sp->sent + 1, pcap_geterr(sp->handle.pcap), errno);
+    }
 
 #elif defined HAVE_PCAP_SENDPACKET
-    if ((retcode = pcap_sendpacket(sp->handle.pcap, data, (int)len)) < 0)
-        sendpacket_seterr(sp, "Error with pcap_sendpacket(): %s", pcap_geterr(sp->handle.pcap));
-
-    /* 
-     * pcap_sendpacket returns 0 on success, not the packet length! 
-     * hence, as a special case, update the counters here and return len
-     */
-    sp->bytes_sent += len;
-    sp->sent ++;
-    return len;
+    retcode = pcap_sendpacket(sp->handle.pcap, data, (int)len);
+    if (retcode < 0 && errno == ENOBUFS && !didsig) {
+        sp->retry ++;
+        goto TRY_SEND_AGAIN;
+    } else if (retcode < 0) {
+        sendpacket_seterr(sp, "Error with pcap_sendpacket(packet " COUNTER_SPEC "): %s",
+            sp->sent + 1, pcap_geterr(sp->handle.pcap));
+    } else {
+        /* 
+         * pcap_sendpacket returns 0 on success, not the packet length! 
+         * hence, we have to fix retcode to be more standard on success
+         */
+        retcode = len;
+    }
+
 #endif
 
@@ -259 +270 @@
     
     memset(buf, 0, sizeof(buf));
-    sprintf(buf, "Statistics for network device: %s\n", sp->device);
-    sprintf(buf, "Attempted packets:   " COUNTER_SPEC "\n", sp->attempt);
-    sprintf(buf, "Successful packets:  " COUNTER_SPEC "\n", sp->sent);
-    sprintf(buf, "Failed packets:      " COUNTER_SPEC "\n", sp->failed);
-    sprintf(buf, "Retried packets:     " COUNTER_SPEC "\n", sp->retry);
+    sprintf(buf, "Statistics for network device: %s\n"
+        "\tAttempted packets:   " COUNTER_SPEC "\n"
+        "\tSuccessful packets:  " COUNTER_SPEC "\n"
+        "\tFailed packets:      " COUNTER_SPEC "\n"
+        "\tRetried packets:     " COUNTER_SPEC "\n",
+        sp->device, sp->attempt, sp->sent, sp->failed, sp->retry);
     return(buf);
 }
@@ -337 +349 @@
     pcap_t *pcap;
     sendpacket_t *sp;
-    
+    /*
+    u_int spoof_eth_src = 1;
+    int fd;
+    */
     assert(device);
     assert(errbuf);
+
+    dbg(1, "sendpacket: using Libpcap");
     
     /* open_pcap_live automatically fills out our errbuf for us */
@@ -348 +365 @@
     strlcpy(sp->device, device, sizeof(sp->device));
     sp->handle.pcap = pcap;
+/*
+    fd = pcap_get_selectable_fd(pcap);
+    if (ioctl(fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1) {
+        errx(1, "Unable to enable source MAC spoof support: %s", strerror(errno));
+    }
+*/    
     return sp;
 }
@@ -369 +392 @@
     assert(device);
     assert(errbuf);
+    
+    dbg(1, "sendpacket: using Libnet");
     
     if ((lnet = libnet_init(LIBNET_LINK_ADV, device, errbuf)) == NULL)
@@ -411 +436 @@
     assert(errbuf);
    
+   dbg(1, "sendpacket: using PF_PACKET");
+
     /* open our socket */
     if ((mysocket = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL))) < 0) {
@@ -568 +595 @@
     memset(&ifr, '\0', sizeof(struct ifreq));
     
+    dbg(1, "sendpacket: using BPF");
     /* open socket */
     mysocket = -1;
@@ -720 +748 @@
 {
     int dlt;
-#if defined HAVE_PF_PACKET || defined HAVE_LIBNET
+#if defined HAVE_BPF
+    int rcode;
+
+    if ((rcode = ioctl(sp->handle.fd, BIOCGDLT, &dlt)) < 0) {
+        warnx("Unable to get DLT value for BPF device (%s): %s", sp->device, strerror(errno));
+        return(-1);
+    }
+#elif defined HAVE_PF_PACKET || defined HAVE_LIBNET
     /* use libpcap to get dlt */
     pcap_t *pcap;
@@ -730 +765 @@
     dlt = pcap_datalink(pcap);
     pcap_close(pcap);
-#elif defined HAVE_BPF
-    int rcode;
-
-    if ((rcode = ioctl(sp->handle.fd, BIOCGDLT, &dlt)) < 0) {
-        warnx("Unable to get DLT value for BPF device (%s): %s", sp->device, strerror(errno));
-        return(-1);
-    }
-#else /* HAVE_PCAP_SENDPACKET / HAVE_PCAP_INJECT */
+#elif defined HAVE_PCAP_SENDPACKET || defined HAVE_PCAP_INJECT
     dlt = pcap_datalink(sp->handle.pcap);
 #endif
     return dlt;
 }
-
-