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

Timestamp:

11/01/07 11:58:18 (14 months ago)

Author:

aturner

Message:

merge -r 1921:1937 from branches/3.2 refs #276

Files:

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

trunk/src/common/sendpacket.c

@@ -392 +392 @@
     pcap_t *pcap;
     sendpacket_t *sp;
-/*
+#ifdef BIOCSHDRCMPLT
     u_int spoof_eth_src = 1;
     int fd;
- */
+#endif
+
     assert(device);
     assert(errbuf);
@@ -408 +409 @@
     strlcpy(sp->device, device, sizeof(sp->device));
     sp->handle.pcap = pcap;
-
-/*
+    
+#ifdef BIOCSHDRCMPLT
+    /* 
+     * Only systems using BPF on the backend need this... 
+     * other systems don't have ioctl and will get compile errors.
+     */
     fd = pcap_get_selectable_fd(pcap);
-    if (ioctl(fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1) {
+    if (ioctl(fd, BIOCSHDRCMPLT, &spoof_eth_src) == -1)
         errx(1, "Unable to enable source MAC spoof support: %s", strerror(errno));
-    }
- */
-    
+#endif
     return sp;
 }
@@ -648 +651 @@
     struct bpf_version bv;
     u_int v;
-#if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT) && !(__APPLE__)
+#if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT)
     u_int spoof_eth_src = 1;
 #endif
@@ -705 +708 @@
      *  automatic filling of the link level source address.
      */
-#if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT) && !(__APPLE__)
+#if defined(BIOCGHDRCMPLT) && defined(BIOCSHDRCMPLT)
     if (ioctl(mysocket, BIOCSHDRCMPLT, &spoof_eth_src) == -1) {
         snprintf(errbuf, SENDPACKET_ERRBUF_SIZE,