OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 21... Line 21...
21 +PRECOMPILED_FILTER=y 21 +PRECOMPILED_FILTER=y
22 + 22 +
23 # Uncomment the next line to enable multilink PPP (enabled by default) 23 # Uncomment the next line to enable multilink PPP (enabled by default)
24 # Linux distributions: Please leave multilink ENABLED in your builds 24 # Linux distributions: Please leave multilink ENABLED in your builds
25 # of pppd! 25 # of pppd!
26 @@ -194,6 +197,14 @@ CFLAGS += -DPPP_FILTER -I$(STAGING_DIR) 26 @@ -183,6 +186,14 @@ CFLAGS += -DPPP_FILTER -I$(STAGING_DIR)
27 endif 27 endif
28 endif 28 endif
Line 29... Line 29...
29 29
30 +ifdef PRECOMPILED_FILTER 30 +ifdef PRECOMPILED_FILTER
Line 46... Line 46...
46 #include <pcap.h> 46 #include <pcap.h>
47 +#include <pcap-bpf.h> 47 +#include <pcap-bpf.h>
48 /* 48 /*
49 * There have been 3 or 4 different names for this in libpcap CVS, but 49 * There have been 3 or 4 different names for this in libpcap CVS, but
50 * this seems to be what they have settled on... 50 * this seems to be what they have settled on...
51 @@ -170,6 +171,13 @@ static int setlogfile __P((char **)); 51 @@ -165,6 +166,13 @@ static int setlogfile __P((char **));
52 static int loadplugin __P((char **)); 52 static int loadplugin __P((char **));
53 #endif 53 #endif
Line 54... Line 54...
54 54
55 +#ifdef PPP_PRECOMPILED_FILTER 55 +#ifdef PPP_PRECOMPILED_FILTER
Line 60... Line 60...
60 +#endif 60 +#endif
61 + 61 +
62 #ifdef PPP_FILTER 62 #ifdef PPP_FILTER
63 static int setpassfilter __P((char **)); 63 static int setpassfilter __P((char **));
64 static int setactivefilter __P((char **)); 64 static int setactivefilter __P((char **));
65 @@ -362,6 +370,14 @@ option_t general_options[] = { 65 @@ -344,6 +352,14 @@ option_t general_options[] = {
66 "set filter for active pkts", OPT_PRIO }, 66 "set filter for active pkts", OPT_PRIO },
67 #endif 67 #endif
Line 68... Line 68...
68 68
69 +#ifdef PPP_PRECOMPILED_FILTER 69 +#ifdef PPP_PRECOMPILED_FILTER
Line 75... Line 75...
75 +#endif 75 +#endif
76 + 76 +
77 #ifdef MAXOCTETS 77 #ifdef MAXOCTETS
78 { "maxoctets", o_int, &maxoctets, 78 { "maxoctets", o_int, &maxoctets,
79 "Set connection traffic limit", 79 "Set connection traffic limit",
80 @@ -1511,6 +1527,29 @@ callfile(argv) 80 @@ -1493,6 +1509,29 @@ callfile(argv)
81 return ok; 81 return ok;
82 } 82 }
Line 83... Line 83...
83 83
84 +#ifdef PPP_PRECOMPILED_FILTER 84 +#ifdef PPP_PRECOMPILED_FILTER