[Bro-Dev] [Bro-Commits] [git/bro] topic/jsiwek/ipv6-ext-headers: Fix ipv6_ext_headers event and add routing0_data_to_addrs BIF. (5312a90)

Siwek, Jonathan Luke jsiwek at illinois.edu
Fri Mar 30 10:27:20 PDT 2012


On Mar 30, 2012, at 11:47 AM, Seth Hall wrote:

> 
> On Mar 30, 2012, at 12:43 PM, Siwek, Jonathan Luke wrote:
> 
>> In your branch, you can probably try just removing the IPAddr:: scoping.
> 
> 
> I actually tried that already…
> 
> /Users/seth/bro/bro.merging/src/IP.cc: In member function ‘RecordVal* IPv6_Hdr::BuildRecordVal(VectorVal*) const’:
> /Users/seth/bro/bro.merging/src/IP.cc:77: error: no matching function for call to ‘AddrVal::AddrVal(const in6_addr&)’
> /Users/seth/bro/bro.merging/src/IP.cc:78: error: no matching function for call to ‘AddrVal::AddrVal(const in6_addr&)’
> /Users/seth/bro/bro.merging/src/IP.cc: In member function ‘void IPv6_Hdr_Chain::Init(const ip6_hdr*, bool, uint16)’:
> /Users/seth/bro/bro.merging/src/IP.cc:317: error: no matching function for call to ‘Reporter::Weird(IPAddr&, const in6_addr&, const char [17])’

Those are because in topic/robin/log-threads, the appropriate IPAddr conversion ctors are marked as 'explicit', but they are not marked as such in master.  I'd explicitly add the IPAddr() ctor at those lines to fix it since the implicit conversion might be harder to understand when someone's reading code.

On Mar 30, 2012, at 11:52 AM, Bernhard Amann wrote:

> The same thing happens when I merge master with my input branch. So - it does not seem to be branch-specific.

Looks like your branch is probably downstream from Robin's, so it makes sense you get the same thing?

On Mar 30, 2012, at 12:03 PM, Robin Sommer wrote:

> Let me merge master into my logging branch, that might trigger the
> same problem and I'll fix it then.

I've done that and fixed it locally like I mentioned above.  Let me know if it's easier for you if I just push it, else I'll let you fix it to avoid causing more chaos/confusion.

+Jon


More information about the bro-dev mailing list