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