* origin/topic/timw/coverity:
Mark FileAssembler destructor as default, remove implementation
Remove a few protected or private no-op constructors
Properly initialize Timer::type. Fixes Coverity 1431144.
Properly initialize members of Reassembler. Fixes Coverity 1413348.
Fix a number of Coverity issues in Dict
* FlyingWithJerome/master:
remove variables in netvar, use tabs in DNS.h and polish comments in dns events.
add new line at the end of the test baseline
add data+=option_len to skip unknown bytes
better explanation to server cookie
better explanation to server cookie
add edns-cookie testcase
remove data+=option_len error in cookie and keepalive
add EDNS cookie parsing
lazy commit
lazy commit
lazy commit
add testcases
add units (100ms) to comments
initial adding EDNS TCP keepalive
- In this merge commit: fixed parentheses/typo that breaks compilation
* origin/topic/robin/gh-467-addto:
Catch if &add_func/&delete_func is applied to IDs that don't have values.
1431186: Asserting that an unsigned value is >= 0 is pointless
1431188/1431189/1431191: Side effect of using an assignment operator in a call to ASSERT()
1431193: Dereference after null check could lead to null being used
1431195: Use of rand() replaced with random()
* 'action-drop' of https://github.com/LBL-gov/zeek:
Moved verb ACTION_DROP from policy/frameworks/netcontrol/catch-and-release.zeek to base/frameworks/notice/main.zeek.
ACTION_DROP is not only part of catch-n-release subsystem.
Also, historically ACTION_DROP has been bundled with ACTION_LOG, ACTION_ALARM, ACTION_EMAIL... and its helpful that this verb remains in base/frameworks/notice/main.zeek
These are to support actions taken on corsa and keep them distinct from ACLD drops/restore or BGP nullzero/nonullzero.
This does not negatively impacts anything - only adds new verbs for handling zeek-netcontrol actions.
* origin/topic/timw/open-dict: (40 commits)
Move Dict constants to detail namespace
Add a few missing deprecation fixes
Adjust Dict whitespace/style
Adjust more btest timings
Improve termination reliability/speed for brokerstore btests
General btest cleanup
Update NEWS about change in Dictionary implementation
Improve Intel expire-item btest to be less time-sensitive
Improve btests with unstable table/set output ordering
Update doc submodule
Adjust a few btests that were unstable due to time-sensitivity
Fix DNS script deleting a table element while iterating
Improve a brokerstore btest to filter out Broker connection messages
Sort output of a few SumStats cluster tests
Fix extract_first_email_addr() to really return the first email
Add find_all_ordered() BIF
Extend external test suite canonifier with set-sorting logic
Update btests/baselines for OpenDict compat
Fix new/malloc/delete/free mismatches in Dictionary code
Add explanation for a Dict TODO item
...
