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

Fix the ptr_name_to_addr BiF to work with IPv6

Browse source
This commit is contained in:
Daniel Thayer 2012-02-07 16:15:13 -06:00
parent 5ad0bab9b0
commit 31565d6987
1 changed files with 48 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/bro.bif
View file

@ -2322,12 +2322,16 @@ function to_port%(s: string%): port
## .. bro:see:: addr_to_ptr_name parse_dotted_addr ## .. bro:see:: addr_to_ptr_name parse_dotted_addr
function ptr_name_to_addr%(s: string%): addr function ptr_name_to_addr%(s: string%): addr
%{ %{
if ( s->Len() != 72 )
{
int a[4]; int a[4];
uint32 addr; uint32 addr;
char ss[13]; // this will contain "in-addr.arpa"
if ( sscanf(s->CheckString(), if ( sscanf(s->CheckString(),
"%d.%d.%d.%d.in-addr.arpa", "%d.%d.%d.%d.%12s",
a, a+1, a+2, a+3) != 4 ) a, a+1, a+2, a+3, ss) != 5
|| strcmp(ss, "in-addr.arpa") != 0 )
{ {
builtin_error("bad PTR name", @ARG@[0]); builtin_error("bad PTR name", @ARG@[0]);
addr = 0; addr = 0;
@ -2336,6 +2340,40 @@ function ptr_name_to_addr%(s: string%): addr
addr = (a[3] << 24) | (a[2] << 16) | (a[1] << 8) | a[0]; addr = (a[3] << 24) | (a[2] << 16) | (a[1] << 8) | a[0];
return new AddrVal(htonl(addr)); return new AddrVal(htonl(addr));
}
else
{
uint32 addr6[4];
uint32 b[32];
char ss[9]; // this will contain "ip6.arpa"
if ( sscanf(s->CheckString(),
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x."
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x."
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x."
"%1x.%1x.%1x.%1x.%1x.%1x.%1x.%1x.%8s",
b+31, b+30, b+29, b+28, b+27, b+26, b+25, b+24,
b+23, b+22, b+21, b+20, b+19, b+18, b+17, b+16,
b+15, b+14, b+13, b+12, b+11, b+10, b+9, b+8,
b+7, b+6, b+5, b+4, b+3, b+2, b+1, b, ss) != 33
|| strcmp(ss, "ip6.arpa") != 0 )
{
builtin_error("bad PTR name", @ARG@[0]);
memset(addr6, 0, sizeof addr6);
}
else
{
for ( unsigned int i = 0; i < 4; ++i )
{
uint32 a = 0;
for ( unsigned int j = 1; j <= 8; ++j )
a |= b[8*i+j-1] << (32-j*4);
addr6[i] = htonl(a);
}
}
return new AddrVal(addr6);
}
%} %}
## Converts an IP address to a reverse pointer name. For example, ## Converts an IP address to a reverse pointer name. For example,