Changeset 3ed9a80 for lib

Timestamp:

10/16/06 16:50:08 (16 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

4362100

Parents:

0c835956

Message:

Listen to the promisc flags

File:

• lib/format_linux.c (modified) (2 diffs)

lib/format_linux.c

@@ -77 +77 @@
                 malloc(sizeof(struct libtrace_format_data_t));
         FORMAT(libtrace->format_data)->fd = -1;
-        FORMAT(libtrace->format_data)->promisc = 0;
+        FORMAT(libtrace->format_data)->promisc = -1;
         FORMAT(libtrace->format_data)->snaplen = 65536;
 
@@ -122 +122 @@
                 return -1;
         }
-        /* enable promisc mode when listening on an interface */
-        if (addr.sll_ifindex!=0) {
+
+        /* If promisc hasn't been specified, set it to "true" if we're 
+         * capturing on one interface, or "false" if we're capturing on
+         * all interfaces.
+         */ 
+        if (FORMAT(libtrace->format_data)->promisc==-1) {
+                if (addr.sll_ifindex!=0)
+                        FORMAT(libtrace->format_data)->promisc=1;
+                else
+                        FORMAT(libtrace->format_data)->promisc=0;
+        }
+                                
+        if (FORMAT(libtrace->format_data)->promisc) {
                 struct packet_mreq mreq;
                 socklen_t socklen = sizeof(mreq);