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

Merge branch 'replace-bzero' of https://github.com/brimsec/zeek

Browse source 
* 'replace-bzero' of https://github.com/brimsec/zeek:
  Replace bzero() with memset()
This commit is contained in:
Johanna Amann 2020-05-15 19:47:55 +00:00
commit 781c3e5914
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
3.2.0-dev.539 | 2020-05-15 19:47:55 +0000
* Replace bzero() with memset() (Noah Treuhaft)
* Change Coverity action to output build log (Jon Siwek, Corelight)
3.2.0-dev.530 | 2020-05-13 15:05:31 -0700 3.2.0-dev.530 | 2020-05-13 15:05:31 -0700
* GH-906: Fix the regex in url.zeek to better match for find_all_urls (Tim Wojtulewicz, Corelight) * GH-906: Fix the regex in url.zeek to better match for find_all_urls (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.530 3.2.0-dev.539

4
src/Conn.cc
View file

@ -80,12 +80,12 @@ Connection::Connection(NetSessions* s, const ConnIDKey& k, double t, const ConnI
if ( pkt->l2_src ) if ( pkt->l2_src )
memcpy(orig_l2_addr, pkt->l2_src, sizeof(orig_l2_addr)); memcpy(orig_l2_addr, pkt->l2_src, sizeof(orig_l2_addr));
else else
bzero(orig_l2_addr, sizeof(orig_l2_addr)); memset(orig_l2_addr, 0, sizeof(orig_l2_addr));
if ( pkt->l2_dst ) if ( pkt->l2_dst )
memcpy(resp_l2_addr, pkt->l2_dst, sizeof(resp_l2_addr)); memcpy(resp_l2_addr, pkt->l2_dst, sizeof(resp_l2_addr));
else else
bzero(resp_l2_addr, sizeof(resp_l2_addr)); memset(resp_l2_addr, 0, sizeof(resp_l2_addr));
vlan = pkt->vlan; vlan = pkt->vlan;
inner_vlan = pkt->inner_vlan; inner_vlan = pkt->inner_vlan;

7
src/IntSet.h
View file

@ -27,14 +27,11 @@ private:
unsigned char* set; unsigned char* set;
}; };
#define bzero(p, size) memset(p, 0, size)
inline IntSet::IntSet(unsigned int n) inline IntSet::IntSet(unsigned int n)
{ {
size = n / 8 + 1; size = n / 8 + 1;
set = new unsigned char[size]; set = new unsigned char[size];
bzero(set, size); memset(set, 0, size);
} }
inline IntSet::~IntSet() inline IntSet::~IntSet()
@ -65,5 +62,5 @@ inline bool IntSet::Contains(unsigned int i) const
inline void IntSet::Clear() inline void IntSet::Clear()
{ {
bzero(set, size); memset(set, 0, size);
} }