Changeset 1790

Timestamp:

04/03/07 10:34:23 (20 months ago)

Author:

aturner

Message:

report errno on send failure. and only warn on errors, not exit. This
is to make things a little less painful for people dealing with the BPF
bug in OS X. refs #142

Location:

trunk/src

Files:

• common/sendpacket.c (modified) (3 diffs)
• send_packets.c (modified) (1 diff)

trunk/src/common/sendpacket.c

@@ -203 +203 @@
         goto TRY_SEND_AGAIN;
     } else if (retcode < 0) {
-        sendpacket_seterr(sp, "Error with bpf write(): %s", strerror(errno));
+        sendpacket_seterr(sp, "Error with bpf write(): %s (errno = %d)", 
+            strerror(errno), errno);
     }
 
@@ -225 +226 @@
         goto TRY_SEND_AGAIN;
     } else if (retcode < 0) {
-        sendpacket_seterr(sp, "Error with pcap_inject(packet #" COUNTER_SPEC "): %s", 
-            sp->sent + 1, pcap_geterr(sp->handle.pcap));
+        sendpacket_seterr(sp, "Error with pcap_inject(packet #" 
+            COUNTER_SPEC "): %s (errno = %d)", 
+            sp->sent + 1, pcap_geterr(sp->handle.pcap), errno);
     }
 
@@ -235 +237 @@
         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));
+        sendpacket_seterr(sp, "Error with pcap_sendpacket(packet #" 
+            COUNTER_SPEC "): %s (errno = %d)",
+            sp->sent + 1, pcap_geterr(sp->handle.pcap), errno);
     } else {
         /* 

trunk/src/send_packets.c

@@ -167 +167 @@
         /* write packet out on network */
         if (sendpacket(sp, pktdata, pktlen) < (int)pktlen)
-            errx(1, "Unable to send packet: %s", sendpacket_geterr(sp));
+            warnx("Unable to send packet: %s", sendpacket_geterr(sp));
                 
         /*