d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply vendor revision 470df104c6f55f6d6f390df7448d8eb65c7642b9:

Browse Source 
From: Guy Harris <guy@alum.mit.edu>
Subject: [PATCH] Fix compilation if INET6 isn't defined.

Addresses GitHub issue #541, but differently from the pull request (it
defines gen_gateway() with a function prototype rather than using a
pre-prototype-style definition).
This commit is contained in:
delphij 2017-03-29 03:28:09 +00:00
parent b85d75c33d
commit 104596c1a7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gencode.c
View File

@ -523,7 +523,8 @@ static struct block *gen_host6(compiler_state_t *, struct in6_addr *,
struct in6_addr *, int, int, int); struct in6_addr *, int, int, int);
#endif #endif
#ifndef INET6 #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 #endif
static struct block *gen_ipfrag(compiler_state_t *); static struct block *gen_ipfrag(compiler_state_t *);
static struct block *gen_portatom(compiler_state_t *, int, bpf_int32); static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
@ -690,7 +691,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
} }
initchunks(&cstate); initchunks(&cstate);
cstate.no_optimize = 0; cstate.no_optimize = 0;
#ifdef INET6
cstate.ai = NULL; cstate.ai = NULL;
#endif
cstate.ic.root = NULL; cstate.ic.root = NULL;
cstate.ic.cur_mark = 0; cstate.ic.cur_mark = 0;
cstate.bpf_pcap = p; cstate.bpf_pcap = p;
@ -4902,11 +4905,8 @@ gen_host6(compiler_state_t *cstate, struct in6_addr *addr,
#ifndef INET6 #ifndef INET6
static struct block * static struct block *
gen_gateway(eaddr, alist, proto, dir) gen_gateway(compiler_state_t *cstate, const u_char *eaddr, bpf_u_int32 **alist,
const u_char *eaddr; int proto, int dir)
bpf_u_int32 **alist;
int proto;
int dir;
{ {
struct block *b0, *b1, *tmp; struct block *b0, *b1, *tmp;
@ -6470,7 +6470,7 @@ gen_scode(compiler_state_t *cstate, const char *name, struct qual q)
alist = pcap_nametoaddr(name); alist = pcap_nametoaddr(name);
if (alist == NULL || *alist == NULL) if (alist == NULL || *alist == NULL)
bpf_error(cstate, "unknown host '%s'", name); bpf_error(cstate, "unknown host '%s'", name);
b = gen_gateway(eaddr, alist, proto, dir); b = gen_gateway(cstate, eaddr, alist, proto, dir);
free(eaddr); free(eaddr);
return b; return b;
#else #else