Import of updated file for 0.5 release
This commit is contained in:
parent
8751327cb4
commit
5a92964037
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor/libpcap/dist/; revision=57761
@ -21,7 +21,7 @@
|
||||
*/
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.100 1999/12/08 19:54:03 mcr Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.100.2.1 2000/03/01 14:12:54 itojun Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -2045,15 +2045,21 @@ gen_scode(name, q)
|
||||
tproto = Q_IP;
|
||||
tproto6 = Q_IPV6;
|
||||
}
|
||||
while (res) {
|
||||
for (res = res0; res; res = res->ai_next) {
|
||||
switch (res->ai_family) {
|
||||
case AF_INET:
|
||||
if (tproto == Q_IPV6)
|
||||
continue;
|
||||
|
||||
sin = (struct sockaddr_in *)
|
||||
res->ai_addr;
|
||||
tmp = gen_host(ntohl(sin->sin_addr.s_addr),
|
||||
0xffffffff, tproto, dir);
|
||||
break;
|
||||
case AF_INET6:
|
||||
if (tproto6 == Q_IP)
|
||||
continue;
|
||||
|
||||
sin6 = (struct sockaddr_in6 *)
|
||||
res->ai_addr;
|
||||
tmp = gen_host6(&sin6->sin6_addr,
|
||||
@ -2063,10 +2069,14 @@ gen_scode(name, q)
|
||||
if (b)
|
||||
gen_or(b, tmp);
|
||||
b = tmp;
|
||||
|
||||
res = res->ai_next;
|
||||
}
|
||||
freeaddrinfo(res0);
|
||||
if (b == NULL) {
|
||||
bpf_error("unknown host '%s'%s", name,
|
||||
(proto == Q_DEFAULT)
|
||||
? ""
|
||||
: " for specified address family");
|
||||
}
|
||||
return b;
|
||||
#endif /*INET6*/
|
||||
}
|
||||
@ -2423,7 +2433,7 @@ gen_load(proto, index, size)
|
||||
#ifdef INET6
|
||||
case Q_IPV6:
|
||||
#endif
|
||||
/* XXX Note that we assume a fixed link link header here. */
|
||||
/* XXX Note that we assume a fixed link header here. */
|
||||
s = xfer_to_x(index);
|
||||
tmp = new_stmt(BPF_LD|BPF_IND|size);
|
||||
tmp->s.k = off_nl;
|
||||
|
Loading…
Reference in New Issue
Block a user