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

Fix a compiler warning.

Browse source
This commit is contained in:
Robin Sommer 2013-06-02 20:03:19 -07:00
parent d3d14e10cf
commit 4494643296
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGES
View file

@ -1,4 +1,14 @@
2.1-675 | 2013-06-02 20:03:19 -0700
* Fix a compiler warning. (Robin Sommer)
* Allow named vector/set/table/record constructors. Addresses #983.
(Jon Siwek)
* Adding Makefile target test-all that also runs the BroControl test
suite. (Robin Sommer)
2.1-664 | 2013-05-28 21:37:46 -0700 2.1-664 | 2013-05-28 21:37:46 -0700
* Dangling pointer fix. Addresses #1004. (Jon Siwek) * Dangling pointer fix. Addresses #1004. (Jon Siwek)

2
VERSION
View file

@ -1 +1 @@
2.1-664 2.1-675

6
src/RemoteSerializer.cc
View file

@ -351,10 +351,12 @@ public:
} }
char Type() { return buffer[0]; } char Type() { return buffer[0]; }
RemoteSerializer::PeerID Peer() RemoteSerializer::PeerID Peer()
{ {
// Wow, is this ugly... uint32 tmp;
return ntohl(*(uint32*)(buffer + 4)); memcpy(&tmp, buffer + 4, sizeof(tmp));
return ntohl(tmp);
} }
const char* Raw() { return buffer; } const char* Raw() { return buffer; }