mirror of
https://github.com/zeek/zeek.git
synced 2025-10-14 20:48:21 +00:00
Merge remote-tracking branch 'origin/master' into topic/robin/pktsrc
Conflicts: configure src/CMakeLists.txt src/Net.cc src/PacketSort.cc src/PacketSort.h src/RemoteSerializer.cc src/Sessions.cc src/Sessions.h
This commit is contained in:
commit
bf6dd2e9ca
794 changed files with 119018 additions and 91558 deletions
|
@ -11,6 +11,7 @@ Component::Component(component::Type arg_type, const std::string& arg_name)
|
|||
{
|
||||
type = arg_type;
|
||||
name = arg_name;
|
||||
canon_name = canonify_name(name);
|
||||
}
|
||||
|
||||
Component::~Component()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue