source: npl/internetserver/poptop_ppp/patches/ppp-2.4.2-pcap.patch @ 5160d62

ppp-2.4.2/pppd/options.c

@@ -56 +56 @@
 #endif
 #ifdef PPP_FILTER
 #include <pcap.h>
-#include <pcap-int.h>   /* XXX: To get struct pcap */
 #endif
 
 #include "pppd.h"
@@ -122 +121 @@
 #ifdef PPP_FILTER
 struct  bpf_program pass_filter;/* Filter program for packets to pass */
 struct  bpf_program active_filter; /* Filter program for link-active pkts */
-pcap_t  pc;                     /* Fake struct pcap so we can compile expr */
 #endif
 
 char *current_option;           /* the name of the option being parsed */
@@ -1439 +1437 @@
 setpassfilter(argv)
     char **argv;
 {
-    pc.linktype = DLT_PPP;
-    pc.snapshot = PPP_HDRLEN;
+    pcap_t* pc = pcap_open_dead (DLT_PPP, PPP_HDRLEN);
+    if (!pc) {
+        option_error("error in pass-filter expression: pcap_open_dead failed\n");
+        return 0;
+    }
  
-    if (pcap_compile(&pc, &pass_filter, *argv, 1, netmask) == 0)
+    if (pcap_compile(pc, &pass_filter, *argv, 1, netmask) == 0) {
+        pcap_close(pc);
         return 1;
-    option_error("error in pass-filter expression: %s\n", pcap_geterr(&pc));
+    }
+    option_error("error in pass-filter expression: %s\n", pcap_geterr(pc));
+    pcap_close(pc);
     return 0;
 }
 
@@ -1455 +1459 @@
 setactivefilter(argv)
     char **argv;
 {
-    pc.linktype = DLT_PPP;
-    pc.snapshot = PPP_HDRLEN;
+    pcap_t* pc = pcap_open_dead (DLT_PPP, PPP_HDRLEN);
+    if (!pc) {
+        option_error("error in pass-filter expression: pcap_open_dead failed\n");
+        return 0;
+    }
  
-    if (pcap_compile(&pc, &active_filter, *argv, 1, netmask) == 0)
+    if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == 0) {
+        pcap_close(pc);
         return 1;
-    option_error("error in active-filter expression: %s\n", pcap_geterr(&pc));
+    }
+    option_error("error in active-filter expression: %s\n", pcap_geterr(pc));
+    pcap_close(pc);
     return 0;
 }
 #endif