1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
--- libpcap-1.8.0.orig/gencode.c 2016-07-30 15:42:44.000000000 +0200
+++ libpcap-1.8.0/gencode.c 2016-08-05 02:35:50.655555060 +0200
@@ -523,7 +523,7 @@ 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 +690,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,7 +4848,8 @@ gen_host6(compiler_state_t *cstate, stru
#ifndef INET6
static struct block *
-gen_gateway(eaddr, alist, proto, dir)
+gen_gateway(cstate, eaddr, alist, proto, dir)
+ compiler_state_t *cstate;
const u_char *eaddr;
bpf_u_int32 **alist;
int proto;
@@ -6414,7 +6417,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
|
