* origin/topic/jsiwek/gh-1122:
GH-165: Fix global initializations that indirectly use builtin types
Improve how primary/top-level BIFs get initialized
GH-1122: Allow initializing globals with calls to subdir BIFs
GH-1122: Improve error for global record initialization exceptions
- Replaced "tag" with "attribute" in the error message since the former
is not exactly the same concept/meaning and also not user-facing
terminology
* origin/topic/timw/174-duplicate-attributes:
Allow duplicate attributes in full redefs
Short-circuit checking of whether attr exists
Expanded check for other tag types, fixed btest to cover more tags
GH-174: Add warning for duplicate attributes
The explicit sorting function definition was a temporary stability
workaround with a better fix now being available via
https://github.com/zeek/btest/pull/25
- Did a few whitespace re-adjustments during merge
* origin/topic/timw/266-namespaces-part5:
Update plugin btests for namespace changes
Plugins: Clean up explicit uses of namespaces in places where they're not necessary.
Base: Clean up explicit uses of namespaces in places where they're not necessary.
* origin/topic/timw/smith-waterman-iterators:
Mark Continuation.h and PacketDumper.h as deprecated
Remove vector iterator type aliases from SmithWaterman code, fix uses of them
* origin/topic/timw/266-namespaces-part4: (34 commits)
Add missing namespace to usage of get_exe_path in fuzzer
Rename methods in RunState to remove 'net' from their names
Move zeek::net namespace to zeek::run_state namespace.
Move ScannedFile class and associated globals into ScannedFile.h and out of Net.h and scan.l
Rename types in ZeekList.h to be consistent with the style guide
Move NetVar from zeek to zeek::detail namespace
Remove PRI_PTR_COMPAT macros
Fix indentation of namespaced aliases
Move zeek-setup code into namespaces
Move ZeekList types to zeek namespace
Move __RegisterBif from zeek::detail::plugin to zeek::plugin::detail
Remove unimplemented zeek_magic_path/bro_magic_path method
Move all plugin classes into zeek::plugin::detail namespaces
Rename BroList.h to ZeekList.h
Move a few smaller files to zeek namespaces
Tag the end of some namespaces for consistency
Move a few of the zeek::util methods and variables to zeek::util::detail
Move zeekygen code to zeek::zeekygen::detail namespace
Mark zeek::util::pad_size as constexpr, which provides a small performance improvement
Move everything in util.h to zeek::util namespace.
...
* 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.
* 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
...
* origin/topic/jsiwek/gh-1080-error-on-enum-redefinition-conflict:
Fix incorrect conflict detection of namespaced-enum-names
Improve error message for an enum name conflicting with non-enum ID
GH-1080: Treat enum name re-use across different enum types as an error
GH-1080: Rename conflicting NetControl::DROP enum definitions
Fixes GH-1080
* origin/topic/johanna/1095-just-get-rid-of-it:
Re-add TYPE_COUNTER without function and deprecation marker.
Completely remove all traces of the COUNTER type.
* origin/topic/timw/266-namespaces-part3: (24 commits)
Properly forward-declare zeek::plugin::plugin in DebugLogger
Rename Brofiler to ScriptCoverageManager
Move Conn and related types to zeek namespace
Move reassembler code to namespaces
Move Session code to namespaces
Move ODesc to zeek namespace
Move Stats and related classes to zeek::detail
Move a few low-use classes to namespaces
Move DebugLogger to zeek namespaces
Move all of the hashing classes/functions to zeek::detail namespace
Move all of the Packet-related classes to namespaces
Move EventMgr, EventHandler, and EventRegistry code to zeek namespace. Rename mgr to event_mgr.
Move Timer and PriorityQueue classes to namespaces
Move BroFile to zeek namespace, rename to File
Move Reporter to zeek namespace
Move DNS_Mgr to zeek::detail namespace
Move BroSubstring to zeek::detail, rename to Substring
Move regex matching code to zeek namespaces
Move all of the rule matching code to zeek::detail
Move IP Addr/Prefix/Header classes into namespaces
...
* origin/topic/timw/clang-tidy:
Don't specify 0u for initial value of loops changed to size_t
Use .empty() instead of checking size against zero
Use properly-sized loop variables or convert to ranged-for (bugprone-too-small-loop-variable)
Merge changes one type over to ptrdiff_t