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

A number of bugfixes for the recent threading updates.

Browse source 
All tests pass now except one:

scripts.base.frameworks.metrics.cluster-intermediate-update

Couldn't figure out yet why that still fails.
This commit is contained in:
Robin Sommer 2012-02-29 14:32:29 -08:00
parent 629ec31ec2
commit df874f0f62
5 changed files with 63 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/IPAddr.h
View file

@ -47,7 +47,7 @@ public:
*
* @param in6 The IPv6 address.
*/
IPAddr(const in4_addr& in4)
explicit IPAddr(const in4_addr& in4)
{
memcpy(in6.s6_addr, v4_mapped_prefix, sizeof(v4_mapped_prefix));
memcpy(&in6.s6_addr[12], &in4.s_addr, sizeof(in4.s_addr));
@ -58,7 +58,7 @@ public:
*
* @param in6 The IPv6 address.
*/
IPAddr(const in6_addr& arg_in6) : in6(arg_in6) { }
explicit IPAddr(const in6_addr& arg_in6) : in6(arg_in6) { }
/**
* Constructs an address instance from a string representation.
@ -523,8 +523,6 @@ public:
*/
string AsString() const;
/** Converts the address into the type used internally by the inter-thread communicastion.
*/
operator std::string() const { return AsString(); }
/**