]> The Tcpdump Group git mirrors - libpcap/commitdiff
There's no "md" substructure; the timeout is now in opt.timeout.
authorGuy Harris <[email protected]>
Tue, 8 Sep 2015 17:23:01 +0000 (10:23 -0700)
committerGuy Harris <[email protected]>
Tue, 8 Sep 2015 17:23:01 +0000 (10:23 -0700)
"md.use_bpf" is now "filtering_in_kernel", but we always do the
filtering in our module, so there's no need to record that fact.

pcap-tc.c

index 50924cca605c3c550f7ec27e4af4e6085d5396f8..b742d4e91de4a69c50c44ce7065cb6d76f4f9497 100644 (file)
--- a/pcap-tc.c
+++ b/pcap-tc.c
@@ -639,12 +639,12 @@ TcActivate(pcap_t *p)
         * if the timeout is 0, it means INFINITE
         */
        
-       if (p->md.timeout == 0)
+       if (p->opt.timeout == 0)
        {
                timeout = 0xFFFFFFFF;
        }
        else
-       if (p->md.timeout < 0)
+       if (p->opt.timeout < 0)
        {
                /*
                 *  we insert a minimal timeout here
@@ -653,7 +653,7 @@ TcActivate(pcap_t *p)
        }
        else
        {
-               timeout = p->md.timeout;
+               timeout = p->opt.timeout;
        }
 
        status = g_TcFunctions.InstanceSetFeature(pt->TcInstance, TC_INST_FT_READ_TIMEOUT, timeout);
@@ -1110,8 +1110,6 @@ TcSetFilter(pcap_t *p, struct bpf_program *fp)
                return -1;
        }
        
-       p->md.use_bpf = 0;
-       
        return (0);
 }