|
 |
74a51e5 |
diff -ur argus-2.0.6.fixes.1/common/argus_filter.c argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c
|
|
|
74a51e5 |
--- argus-2.0.6.fixes.1/common/argus_filter.c 2004-05-10 15:29:10.000000000 +0200
|
|
|
74a51e5 |
+++ argus-2.0.6.fixes.1-libpcap10/common/argus_filter.c 2009-10-04 08:41:35.000000000 +0200
|
|
|
74a51e5 |
@@ -3106,6 +3106,8 @@
|
|
|
74a51e5 |
}
|
|
|
74a51e5 |
|
|
|
74a51e5 |
#ifdef BDEBUG
|
|
|
74a51e5 |
+static void bpf_dump_internal(struct bpf_program *p, int option);
|
|
|
74a51e5 |
+
|
|
|
74a51e5 |
opt_dump(root)
|
|
|
74a51e5 |
struct block *root;
|
|
|
74a51e5 |
{
|
|
|
74a51e5 |
@@ -3113,7 +3115,7 @@
|
|
|
74a51e5 |
|
|
|
74a51e5 |
memset(bids, 0, sizeof bids);
|
|
|
74a51e5 |
f.bf_insns = Argusicode_to_fcode(root, &f.bf_len);
|
|
|
74a51e5 |
- bpf_dump(&f, 1);
|
|
|
74a51e5 |
+ bpf_dump_internal(&f, 1);
|
|
|
74a51e5 |
putchar('\n');
|
|
|
74a51e5 |
free((char *)f.bf_insns);
|
|
|
74a51e5 |
}
|
|
|
74a51e5 |
@@ -3603,6 +3605,7 @@
|
|
|
74a51e5 |
|
|
|
74a51e5 |
|
|
|
74a51e5 |
|
|
|
74a51e5 |
+#ifdef BDEBUG
|
|
|
74a51e5 |
/*
|
|
|
74a51e5 |
* Copyright (c) 1992, 1993, 1994
|
|
|
74a51e5 |
* The Regents of the University of California. All rights reserved.
|
|
|
74a51e5 |
@@ -3628,10 +3631,8 @@
|
|
|
74a51e5 |
|
|
|
74a51e5 |
#include <stdio.h>
|
|
|
74a51e5 |
|
|
|
74a51e5 |
-extern void bpf_dump(struct bpf_program *, int);
|
|
|
74a51e5 |
-
|
|
|
74a51e5 |
-void
|
|
|
74a51e5 |
-bpf_dump(struct bpf_program *p, int option)
|
|
|
74a51e5 |
+static void
|
|
|
74a51e5 |
+bpf_dump_internal(struct bpf_program *p, int option)
|
|
|
74a51e5 |
{
|
|
|
74a51e5 |
struct bpf_insn *insn;
|
|
|
74a51e5 |
int i;
|
|
|
74a51e5 |
@@ -3653,13 +3654,12 @@
|
|
|
74a51e5 |
return;
|
|
|
74a51e5 |
}
|
|
|
74a51e5 |
for (i = 0; i < n; ++insn, ++i) {
|
|
|
74a51e5 |
-#ifdef BDEBUG
|
|
|
74a51e5 |
extern int bids[];
|
|
|
74a51e5 |
printf(bids[i] > 0 ? "[%02d]" : " -- ", bids[i] - 1);
|
|
|
74a51e5 |
-#endif
|
|
|
74a51e5 |
puts(Argusbpf_image(insn, i));
|
|
|
74a51e5 |
}
|
|
|
74a51e5 |
}
|
|
|
74a51e5 |
+#endif
|
|
|
74a51e5 |
|
|
|
74a51e5 |
/*
|
|
|
74a51e5 |
* Copyright (c) 1990, 1991, 1992, 1993, 1994
|
|
|
74a51e5 |
diff -ur argus-2.0.6.fixes.1/include/argus_filter.h argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h
|
|
|
74a51e5 |
--- argus-2.0.6.fixes.1/include/argus_filter.h 2004-02-23 16:00:36.000000000 +0100
|
|
|
74a51e5 |
+++ argus-2.0.6.fixes.1-libpcap10/include/argus_filter.h 2009-10-04 08:37:48.000000000 +0200
|
|
|
74a51e5 |
@@ -142,8 +142,6 @@
|
|
|
74a51e5 |
u_int ipaddrtonetmask(u_int);
|
|
|
74a51e5 |
u_int getnetnumber(u_int);
|
|
|
74a51e5 |
|
|
|
74a51e5 |
-void bpf_dump(struct bpf_program *, int);
|
|
|
74a51e5 |
-
|
|
|
74a51e5 |
char *intoa(u_int);
|
|
|
74a51e5 |
static SIGRET nohostname(int);
|
|
|
74a51e5 |
char * getname(u_char *);
|
|
|
74a51e5 |
@@ -225,8 +223,6 @@
|
|
|
74a51e5 |
extern u_int ipaddrtonetmask(u_int);
|
|
|
74a51e5 |
extern u_int getnetnumber(u_int);
|
|
|
74a51e5 |
|
|
|
74a51e5 |
-extern void bpf_dump(struct bpf_program *, int);
|
|
|
74a51e5 |
-
|
|
|
74a51e5 |
extern char *intoa(u_int);
|
|
|
74a51e5 |
extern char * getname(u_char *);
|
|
|
74a51e5 |
|
|
|
46eca4c |
diff -ur argus-2.0.6.fixes.1/server/ArgusSource.h argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h
|
|
|
46eca4c |
--- argus-2.0.6.fixes.1/server/ArgusSource.h 2004-02-23 16:00:36.000000000 +0100
|
|
|
46eca4c |
+++ argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h 2009-10-04 08:57:29.000000000 +0200
|
|
|
46eca4c |
@@ -324,8 +324,6 @@
|
|
|
46eca4c |
|
|
|
46eca4c |
int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
|
|
|
46eca4c |
|
|
|
46eca4c |
-extern char *bpf_image(struct bpf_insn *, int);
|
|
|
46eca4c |
-
|
|
|
46eca4c |
|
|
|
46eca4c |
#else /* defined(ArgusSource) */
|
|
|
46eca4c |
|