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

Changing prefix for packet sources/dumper from ':' to '%'.

Browse source 
Addresses BIT-1249.
This commit is contained in:
Robin Sommer 2014-09-25 17:53:27 -07:00
parent ea1803881d
commit cce09b75de
11 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,4 +1,18 @@
2.3-196 | 2014-09-25 17:53:27 -0700
* Changing prefix for packet sources/dumper from ':' to '%'.
Addresses BIT-1249. (Robin Sommer)
* Remove timeouts from remote communication loop. The select() now
blocks until there's work to do instead of relying on a small
timeout value which can cause unproductive use of cpu cycles. (Jon
Siwek)
* Improve error message when failing to activate a plugin. Also fix
a unit test helper script that checks plugin availability. (Jon
Siwek)
2.3-183 | 2014-09-24 10:08:04 -0500 2.3-183 | 2014-09-24 10:08:04 -0500
* Add a "node" field to Intel::Seen struture and intel.log to * Add a "node" field to Intel::Seen struture and intel.log to

2
VERSION
View file

@ -1 +1 @@
2.3-183 2.3-196

2
aux/binpac

@ -1 +1 @@
Subproject commit 30c156d879f6303f15ebf8e59989d8a42d882bdf Subproject commit 3a4684801aafa0558383199e9abd711650b53af9

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 30e6ff1a0735f56c015cf979bc1feda38ff00dbf Subproject commit 95afe42e7474113a16cb2cb09ebdf8b552c59744

2
aux/broccoli

@ -1 +1 @@
Subproject commit 07cfcc76fb08365b545bd3f412c3f6e6c92824e9 Subproject commit 33d0ed4a54a6ecf08a0b5fe18831aa413b437066

2
aux/broctl

@ -1 +1 @@
Subproject commit 2606a95c9dcbc83bd863c2981ce7189e5d58697b Subproject commit 2f808bc8541378b1a4953cca02c58c43945d154f

2
cmake

@ -1 +1 @@
Subproject commit f2e8ba6b90b3a2da9f1f77c55d0e718c25376bbb Subproject commit 03de0cc467d2334dcb851eddd843d59fef217909

4
src/iosource/Component.cc
View file

@ -24,7 +24,7 @@ Component::~Component()
PktSrcComponent::PktSrcComponent(const std::string& arg_name, const std::string& arg_prefix, InputType arg_type, factory_callback arg_factory) PktSrcComponent::PktSrcComponent(const std::string& arg_name, const std::string& arg_prefix, InputType arg_type, factory_callback arg_factory)
: iosource::Component(plugin::component::PKTSRC, arg_name) : iosource::Component(plugin::component::PKTSRC, arg_name)
{ {
tokenize_string(arg_prefix, ":", &prefixes); tokenize_string(arg_prefix, "%", &prefixes);
type = arg_type; type = arg_type;
factory = arg_factory; factory = arg_factory;
} }
@ -110,7 +110,7 @@ void PktSrcComponent::DoDescribe(ODesc* d) const
PktDumperComponent::PktDumperComponent(const std::string& name, const std::string& arg_prefix, factory_callback arg_factory) PktDumperComponent::PktDumperComponent(const std::string& name, const std::string& arg_prefix, factory_callback arg_factory)
: plugin::Component(plugin::component::PKTDUMPER, name) : plugin::Component(plugin::component::PKTDUMPER, name)
{ {
tokenize_string(arg_prefix, ":", &prefixes); tokenize_string(arg_prefix, "%", &prefixes);
factory = arg_factory; factory = arg_factory;
} }

2
src/iosource/Manager.cc
View file

@ -201,7 +201,7 @@ static std::pair<std::string, std::string> split_prefix(std::string path)
// PktSrc to use. If not, choose default. // PktSrc to use. If not, choose default.
std::string prefix; std::string prefix;
std::string::size_type i = path.find(":"); std::string::size_type i = path.find("%");
if ( i != std::string::npos ) if ( i != std::string::npos )
{ {
prefix = path.substr(0, i); prefix = path.substr(0, i);

2
testing/btest/plugins/pktdumper.bro
View file

@ -3,6 +3,6 @@
# @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/port4242.trace -w foo:XXX %INPUT FilteredTraceDetection::enable=F >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r $TRACES/port4242.trace -w foo/XXX %INPUT FilteredTraceDetection::enable=F >>output
# @TEST-EXEC: btest-diff output # @TEST-EXEC: btest-diff output

2
testing/btest/plugins/pktsrc.bro
View file

@ -3,6 +3,6 @@
# @TEST-EXEC: ./configure --bro-dist=${DIST} && make # @TEST-EXEC: ./configure --bro-dist=${DIST} && make
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -NN Demo::Foo >>output
# @TEST-EXEC: echo === >>output # @TEST-EXEC: echo === >>output
# @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r foo:XXX %INPUT FilteredTraceDetection::enable=F >>output # @TEST-EXEC: BRO_PLUGIN_PATH=`pwd` bro -r foo/XXX %INPUT FilteredTraceDetection::enable=F >>output
# @TEST-EXEC: btest-diff conn.log # @TEST-EXEC: btest-diff conn.log