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

Move BroString to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 10:54:29 -07:00
parent 464efbe66a
commit 58c6e10b62
54 changed files with 317 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Base64.cc
View file

@ -35,7 +35,7 @@ void Base64Converter::Encode(int len, const unsigned char* data, int* pblen, cha
for ( int i = 0, j = 0; (i < len) && ( j < blen ); )
{
uint32_t bit32 = data[i++] << 16;
bit32 += (i++ < len ? data[i-1] : 0) << 8;
bit32 += (i++ < len ? data[i-1] : 0) << 8;
bit32 += i++ < len ? data[i-1] : 0;
buf[j++] = alphabet[(bit32 >> 18) & 0x3f];
@ -228,7 +228,7 @@ void Base64Converter::IllegalEncoding(const char* msg)
reporter->Error("%s", msg);
}
BroString* decode_base64(const BroString* s, const BroString* a, Connection* conn)
zeek::BroString* decode_base64(const zeek::BroString* s, const zeek::BroString* a, Connection* conn)
{
if ( a && a->Len() != 0 && a->Len() != 64 )
{
@ -255,14 +255,14 @@ BroString* decode_base64(const BroString* s, const BroString* a, Connection* con
rlen += rlen2;
rbuf[rlen] = '\0';
return new BroString(true, (u_char*) rbuf, rlen);
return new zeek::BroString(true, (u_char*) rbuf, rlen);
err:
delete [] rbuf;
return nullptr;
}
BroString* encode_base64(const BroString* s, const BroString* a, Connection* conn)
zeek::BroString* encode_base64(const zeek::BroString* s, const zeek::BroString* a, Connection* conn)
{
if ( a && a->Len() != 0 && a->Len() != 64 )
{
@ -276,5 +276,5 @@ BroString* encode_base64(const BroString* s, const BroString* a, Connection* con
Base64Converter enc(conn, a ? a->CheckString() : "");
enc.Encode(s->Len(), (const unsigned char*) s->Bytes(), &outlen, &outbuf);
return new BroString(true, (u_char*)outbuf, outlen);
return new zeek::BroString(true, (u_char*)outbuf, outlen);
}