forked from Lainports/freebsd-ports
b055279630
Obtained from: https://github.com/DragonFlyBSD/DeltaPorts/pull/602 Sponsored by: Rubicon Communications (Netgate)
45 lines
1.4 KiB
C
45 lines
1.4 KiB
C
--- gencode.c.orig 2016-07-30 13:42:44 UTC
|
|
+++ gencode.c
|
|
@@ -523,7 +523,8 @@ static struct block *gen_host6(compiler_
|
|
struct in6_addr *, int, int, int);
|
|
#endif
|
|
#ifndef INET6
|
|
-static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
|
|
+static struct block *gen_gateway(compiler_state_t *, const u_char *,
|
|
+ bpf_u_int32 **, int, int);
|
|
#endif
|
|
static struct block *gen_ipfrag(compiler_state_t *);
|
|
static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
|
|
@@ -690,7 +691,9 @@ pcap_compile(pcap_t *p, struct bpf_progr
|
|
}
|
|
initchunks(&cstate);
|
|
cstate.no_optimize = 0;
|
|
+#ifdef INET6
|
|
cstate.ai = NULL;
|
|
+#endif
|
|
cstate.ic.root = NULL;
|
|
cstate.ic.cur_mark = 0;
|
|
cstate.bpf_pcap = p;
|
|
@@ -4846,11 +4849,8 @@ gen_host6(compiler_state_t *cstate, stru
|
|
|
|
#ifndef INET6
|
|
static struct block *
|
|
-gen_gateway(eaddr, alist, proto, dir)
|
|
- const u_char *eaddr;
|
|
- bpf_u_int32 **alist;
|
|
- int proto;
|
|
- int dir;
|
|
+gen_gateway(compiler_state_t *cstate, const u_char *eaddr,
|
|
+ bpf_u_int32 **alist, int proto, int dir)
|
|
{
|
|
struct block *b0, *b1, *tmp;
|
|
|
|
@@ -6414,7 +6414,7 @@ gen_scode(compiler_state_t *cstate, cons
|
|
alist = pcap_nametoaddr(name);
|
|
if (alist == NULL || *alist == NULL)
|
|
bpf_error(cstate, "unknown host '%s'", name);
|
|
- b = gen_gateway(eaddr, alist, proto, dir);
|
|
+ b = gen_gateway(cstate, eaddr, alist, proto, dir);
|
|
free(eaddr);
|
|
return b;
|
|
#else
|