rpms/ppp
5
0
Fork 0
Code Issues Pull Requests Releases Activity

[tw] - - not using internal libpcap structures anymore, fixes

Browse Source 
inbound/outbound filter processing (#128053)
This commit is contained in:
Thomas Woerner 2004-09-15 09:57:08 +00:00
parent becbabda47
commit 45556c384c
1 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ppp-2.4.2-pcap.patch Normal file
View File

@ -0,0 +1,64 @@
--- ppp-2.4.2/pppd/options.c.pcap 2004-01-13 05:02:07.000000000 +0100
+++ ppp-2.4.2/pppd/options.c 2004-09-15 11:39:34.832772935 +0200
@@ -56,7 +56,6 @@
#endif
#ifdef PPP_FILTER
#include <pcap.h>
-#include <pcap-int.h> /* XXX: To get struct pcap */
#endif
#include "pppd.h"
@@ -122,7 +121,6 @@
#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,12 +1437,18 @@
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,12 +1459,18 @@
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