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

Support other byte lengths in bytestring_to_count

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-08-11 10:09:04 -07:00
parent 73f20ba761
commit 90f0e7a6ea
3 changed files with 69 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/zeek.bif
View file

@ -2961,26 +2961,32 @@ function bytestring_to_count%(s: string, is_le: bool &default=F%): count
static const bool host_bigendian = false;
#endif
const u_char *p = s->Bytes();
unsigned int i;
unsigned int i = 0;
switch ( s->Len() ) {
case sizeof(uint8_t):
if ( s->Len() == 0 )
{
return zeek::val_mgr->Count(0);
}
if ( s->Len() == sizeof(uint8_t) )
{
uint8_t value = 0;
memcpy(&value, p, sizeof(uint8_t));
return zeek::val_mgr->Count(value);
}
case sizeof(uint16_t):
else if ( s->Len() <= sizeof(uint16_t) )
{
uint16_t value = 0;
if ( (host_bigendian && is_le) || (! host_bigendian && ! is_le) )
{
char buf[sizeof(uint16_t)];
memset(buf, 0, sizeof(uint16_t));
char *d = &buf[sizeof(uint16_t)-1];
for ( i = 0; i < sizeof(uint16_t); i++ )
if ( is_le )
d -= sizeof(uint16_t) - s->Len();
for ( i = 0; i < s->Len(); i++ )
*d-- = *p++;
memcpy(&value, buf, sizeof(uint16_t));
@ -2990,47 +2996,66 @@ function bytestring_to_count%(s: string, is_le: bool &default=F%): count
return zeek::val_mgr->Count(value);
}
case sizeof(uint32_t):
else if ( s->Len() <= sizeof(uint32_t) )
{
uint32_t value = 0;
char buf[sizeof(uint32_t)];
memset(buf, 0, sizeof(uint32_t));
if ( (host_bigendian && is_le) || (! host_bigendian && ! is_le) )
{
char buf[sizeof(uint32_t)];
char *d = &buf[sizeof(uint32_t)-1];
for ( i = 0; i < sizeof(uint32_t); i++ )
*d-- = *p++;
if ( ! is_le )
d -= sizeof(uint32_t) - s->Len();
memcpy(&value, buf, sizeof(uint32_t));
for ( i = 0; i < s->Len(); i++ )
*d-- = *p++;
}
else
memcpy(&value, p, sizeof(uint32_t));
{
char* d = &buf[0];
if ( ! is_le )
d += sizeof(uint32_t) - s->Len();
for ( i = 0; i < s->Len(); i++ )
*d++ = *p++;
}
memcpy(&value, buf, sizeof(uint32_t));
return zeek::val_mgr->Count(value);
}
case sizeof(uint64_t):
else if ( s->Len() <= sizeof(uint64_t) )
{
uint64_t value = 0;
char buf[sizeof(uint64_t)];
memset(buf, 0, sizeof(uint64_t));
if ( (host_bigendian && is_le) || (! host_bigendian && ! is_le) )
{
char buf[sizeof(uint64_t)];
char *d = &buf[sizeof(uint64_t)-1];
for ( i = 0; i < sizeof(uint64_t); i++ )
*d-- = *p++;
if ( ! is_le )
d -= sizeof(uint64_t) - s->Len();
memcpy(&value, buf, sizeof(uint64_t));
for ( i = 0; i < s->Len(); i++ )
*d-- = *p++;
}
else
memcpy(&value, p, sizeof(uint64_t));
{
char* d = &buf[0];
if ( ! is_le )
d += sizeof(uint64_t) - s->Len();
for ( i = 0; i < s->Len(); i++ )
*d++ = *p++;
}
memcpy(&value, buf, sizeof(uint64_t));
return zeek::val_mgr->Count(value);
}
}
zeek::emit_builtin_error("unsupported byte length for bytestring_to_count");
return zeek::val_mgr->Count(0);

14
testing/btest/Baseline/bifs.bytestring_to_count/out
View file

@ -1,10 +1,6 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
0
0
0
0
0
0
255
255
0
@ -27,6 +23,10 @@
2864429994
0
0
65535
65535
16777215
16777215
18446744073709551615
18446744073709551615
18446742974214701055
@ -35,4 +35,10 @@
65535
0
0
1099511627775
1099511627775
281474976710655
281474976710655
72057594037927935
72057594037927935
65535

18
testing/btest/bifs/bytestring_to_count.zeek
View file

@ -1,4 +1,4 @@
#
#
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
@ -9,10 +9,6 @@ event zeek_init()
# unsupported byte lengths
print bytestring_to_count("", T); # 0
print bytestring_to_count("", F); # 0
print bytestring_to_count("\xAA\xBB\xCC", T); # 0
print bytestring_to_count("\xAA\xBB\xCC", F); # 0
print bytestring_to_count("\xAA\xBB\xCC\xDD\xEE", T); # 0
print bytestring_to_count("\xAA\xBB\xCC\xDD\xEE", F); # 0
# 8 bit
print bytestring_to_count("\xff", T); # 255
@ -42,6 +38,11 @@ event zeek_init()
print bytestring_to_count("\x00\x00\x00\x00", F); # 0
print bytestring_to_count("\x00\x00\x00\x00", T); # 0
print bytestring_to_count("\x00\xff\xff", F); # 65535
print bytestring_to_count("\xff\xff\x00", T); # 65535
print bytestring_to_count("\xff\xff\xff", F); # 16777215
print bytestring_to_count("\xff\xff\xff", T); # 16777215
# 64 bit
print bytestring_to_count("\xff\xff\xff\xff\xff\xff\xff\xff", F); # 18446744073709551615
print bytestring_to_count("\xff\xff\xff\xff\xff\xff\xff\xff", T); # 18446744073709551615
@ -52,6 +53,13 @@ event zeek_init()
print bytestring_to_count("\x00\x00\x00\x00\x00\x00\x00\x00", T); # 0
print bytestring_to_count("\x00\x00\x00\x00\x00\x00\x00\x00", F); # 0
print bytestring_to_count("\xff\xff\xff\xff\xff", F); # 1099511627775
print bytestring_to_count("\xff\xff\xff\xff\xff", T); # 1099511627775
print bytestring_to_count("\xff\xff\xff\xff\xff\xff", F); # 281474976710655
print bytestring_to_count("\xff\xff\xff\xff\xff\xff", T); # 281474976710655
print bytestring_to_count("\xff\xff\xff\xff\xff\xff\xff", F); # 72057594037927935
print bytestring_to_count("\xff\xff\xff\xff\xff\xff\xff", T); # 72057594037927935
# test the default endianness parameter
print bytestring_to_count("\x00\x00\x00\x00\x00\x00\xff\xff"); # 65535