Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into topic/seth/64bit-binpac-updates

Browse source
This commit is contained in:
Jon Siwek 2012-04-17 11:09:09 -05:00
commit 1a5517f170
9 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,4 +1,14 @@
2.0-273 | 2012-04-16 18:08:56 -0700
* Removing QR flag from DNS log in response, which should not have
been there in the first place. (Seth Hall)
* Sync up patricia.c/h with pysubnettree repo. (Daniel Thayer)
* Adding missing leak groups to a couple tests. Also activating leak
checking for proxy in basic-cluster test. (Robin Sommer)
2.0-267 | 2012-04-09 17:47:28 -0700
* Add support for mobile IPv6 Mobility Header (RFC 6275). (Jon

2
VERSION
View file

@ -1 +1 @@
2.0-267
2.0-273

2
aux/broctl

@ -1 +1 @@
Subproject commit 2524b3aeda916b5daaad215c42860c1477c2606b
Subproject commit d50e0efe133c50d824753c86d068467e54a3c47d

2
aux/btest

@ -1 +1 @@
Subproject commit 8da6c55697ff580600cfff474f4ccba2a592f911
Subproject commit 1897d224ce295e91d20e458851759c99734a0a74

2
scripts/base/protocols/dns/main.bro
View file

@ -39,8 +39,6 @@ export {
rcode: count &log &optional;
## A descriptive name for the response code value.
rcode_name: string &log &optional;
## Whether the message is a query (F) or response (T).
QR: bool &log &default=F;
## The Authoritative Answer bit for response messages specifies that
## the responding name server is an authority for the domain name
## in the question section.

20
src/patricia.c
View file

@ -115,16 +115,12 @@ local_inet_pton (int af, const char *src, void *dst)
}
}
#ifdef NT
#ifdef HAVE_IPV6
else if (af == AF_INET6) {
struct in6_addr Address;
return (inet6_addr(src, &Address));
}
#endif /* HAVE_IPV6 */
#endif /* NT */
#ifndef NT
#else
else {
errno = EAFNOSUPPORT;
return -1;
}
@ -160,10 +156,8 @@ my_inet_pton (int af, const char *src, void *dst)
}
memcpy (dst, xp, 4);
return (1);
#ifdef HAVE_IPV6
} else if (af == AF_INET6) {
return (local_inet_pton (af, src, dst));
#endif /* HAVE_IPV6 */
} else {
#ifndef NT
errno = EAFNOSUPPORT;
@ -217,7 +211,6 @@ prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
}
return (buff);
}
#ifdef HAVE_IPV6
else if (prefix->family == AF_INET6) {
char *r;
r = (char *) inet_ntop (AF_INET6, &prefix->add.sin6, buff, 48 /* a guess value */ );
@ -227,7 +220,6 @@ prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
}
return (buff);
}
#endif /* HAVE_IPV6 */
else
return (NULL);
}
@ -255,7 +247,6 @@ New_Prefix2 (int family, void *dest, int bitlen, prefix_t *prefix)
int dynamic_allocated = 0;
int default_bitlen = 32;
#ifdef HAVE_IPV6
if (family == AF_INET6) {
default_bitlen = 128;
if (prefix == NULL) {
@ -265,7 +256,6 @@ New_Prefix2 (int family, void *dest, int bitlen, prefix_t *prefix)
memcpy (&prefix->add.sin6, dest, 16);
}
else
#endif /* HAVE_IPV6 */
if (family == AF_INET) {
if (prefix == NULL) {
#ifndef NT
@ -308,9 +298,7 @@ ascii2prefix (int family, char *string)
u_long bitlen, maxbitlen = 0;
char *cp;
struct in_addr sin;
#ifdef HAVE_IPV6
struct in6_addr sin6;
#endif /* HAVE_IPV6 */
int result;
char save[MAXLINE];
@ -320,19 +308,15 @@ ascii2prefix (int family, char *string)
/* easy way to handle both families */
if (family == 0) {
family = AF_INET;
#ifdef HAVE_IPV6
if (strchr (string, ':')) family = AF_INET6;
#endif /* HAVE_IPV6 */
}
if (family == AF_INET) {
maxbitlen = 32;
}
#ifdef HAVE_IPV6
else if (family == AF_INET6) {
maxbitlen = 128;
}
#endif /* HAVE_IPV6 */
if ((cp = strchr (string, '/')) != NULL) {
bitlen = atol (cp + 1);
@ -355,7 +339,6 @@ ascii2prefix (int family, char *string)
return (New_Prefix (AF_INET, &sin, bitlen));
}
#ifdef HAVE_IPV6
else if (family == AF_INET6) {
// Get rid of this with next IPv6 upgrade
#if defined(NT) && !defined(HAVE_INET_NTOP)
@ -367,7 +350,6 @@ ascii2prefix (int family, char *string)
#endif /* NT */
return (New_Prefix (AF_INET6, &sin6, bitlen));
}
#endif /* HAVE_IPV6 */
else
return (NULL);
}

7
src/patricia.h
View file

@ -52,11 +52,6 @@
#include <sys/types.h>
#ifndef HAVE_IPV6
#define HAVE_IPV6
#endif
/* typedef unsigned int u_int; */
typedef void (*void_fn_t)();
/* { from defs.h */
@ -86,9 +81,7 @@ typedef struct _prefix_t {
int ref_count; /* reference count */
union {
struct in_addr sin;
#ifdef HAVE_IPV6
struct in6_addr sin6;
#endif /* IPV6 */
} add;
} prefix_t;

8
testing/btest/Baseline/core.ipv6-frag/dns.log
View file

@ -3,7 +3,7 @@
#empty_field (empty)
#unset_field -
#path dns
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto trans_id query qclass qclass_name qtype qtype_name rcode rcode_name QR AA TC RD RA Z answers TTLs
#types time string addr port addr port enum count string count string count string count string bool bool bool bool bool count vector[string] vector[interval]
1331084278.438444 UWkUyAuUGXf 2001:470:1f11:81f:d138:5f55:6d4:1fe2 51850 2607:f740:b::f93 53 udp 3903 txtpadding_323.n1.netalyzr.icsi.berkeley.edu 1 C_INTERNET 16 TXT 0 NOERROR F T F T F 0 This TXT record should be ignored 1.000000
1331084293.592245 arKYeMETxOg 2001:470:1f11:81f:d138:5f55:6d4:1fe2 51851 2607:f740:b::f93 53 udp 40849 txtpadding_3230.n1.netalyzr.icsi.berkeley.edu 1 C_INTERNET 16 TXT 0 NOERROR F T F T F 0 This TXT record should be ignored 1.000000
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto trans_id query qclass qclass_name qtype qtype_name rcode rcode_name AA TC RD RA Z answers TTLs
#types time string addr port addr port enum count string count string count string count string bool bool bool bool count vector[string] vector[interval]
1331084278.438444 UWkUyAuUGXf 2001:470:1f11:81f:d138:5f55:6d4:1fe2 51850 2607:f740:b::f93 53 udp 3903 txtpadding_323.n1.netalyzr.icsi.berkeley.edu 1 C_INTERNET 16 TXT 0 NOERROR T F T F 0 This TXT record should be ignored 1.000000
1331084293.592245 arKYeMETxOg 2001:470:1f11:81f:d138:5f55:6d4:1fe2 51851 2607:f740:b::f93 53 udp 40849 txtpadding_3230.n1.netalyzr.icsi.berkeley.edu 1 C_INTERNET 16 TXT 0 NOERROR T F T F 0 This TXT record should be ignored 1.000000

6
testing/btest/Baseline/scripts.policy.protocols.dns.event-priority/dns.log
View file

@ -3,6 +3,6 @@
#empty_field (empty)
#unset_field -
#path dns
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto trans_id query qclass qclass_name qtype qtype_name rcode rcode_name QR AA TC RD RA Z answers TTLs auth addl
#types time string addr port addr port enum count string count string count string count string bool bool bool bool bool count vector[string] vector[interval] table[string] table[string]
930613226.529070 UWkUyAuUGXf 212.180.42.100 25000 131.243.64.3 53 tcp 34798 - - - - - 0 NOERROR F F F F T 0 4.3.2.1 31337.000000 - -
#fields ts uid id.orig_h id.orig_p id.resp_h id.resp_p proto trans_id query qclass qclass_name qtype qtype_name rcode rcode_name AA TC RD RA Z answers TTLs auth addl
#types time string addr port addr port enum count string count string count string count string bool bool bool bool count vector[string] vector[interval] table[string] table[string]
930613226.529070 UWkUyAuUGXf 212.180.42.100 25000 131.243.64.3 53 tcp 34798 - - - - - 0 NOERROR F F F T 0 4.3.2.1 31337.000000 - -