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

[ADD] reworked code to new design suggested by seth.

Browse source 
The openflow framework now supports multiple
controllers. The design now looks a bit object
oriented and a new() function creates a controller
record.

Moved the JSON script from the JSON namespace into a
openflow specific OpenflowJSON namespace
This commit is contained in:
Christian Struck 2014-11-13 16:49:50 -08:00
parent fef8476690
commit d80cc9ea10
4 changed files with 158 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scripts/base/frameworks/openflow/utils/json.bro
View file

@ -1,6 +1,6 @@
@load base/utils/strings
module JSON;
module OpenflowJSON;
export {
## A function to convert arbitrary Bro data into a JSON string.
@ -72,7 +72,7 @@ function convert(v: any, only_loggable: bool &default=F, field_escape_pattern: p
field = cat(sub(field, field_escape_pattern, ""));
if ( field_desc?$value && (!only_loggable || field_desc$log) )
{
local onepart = cat("\"", field, "\": ", JSON::convert(field_desc$value, only_loggable));
local onepart = cat("\"", field, "\": ", OpenflowJSON::convert(field_desc$value, only_loggable));
rec_parts[|rec_parts|] = onepart;
}
}
@ -86,7 +86,7 @@ function convert(v: any, only_loggable: bool &default=F, field_escape_pattern: p
local sa: set[bool] = v;
for ( sv in sa )
{
set_parts[|set_parts|] = JSON::convert(sv, only_loggable);
set_parts[|set_parts|] = OpenflowJSON::convert(sv, only_loggable);
}
return cat("[", join_string_vec(set_parts, ", "), "]");
}
@ -96,9 +96,9 @@ function convert(v: any, only_loggable: bool &default=F, field_escape_pattern: p
local ta: table[bool] of any = v;
for ( ti in ta )
{
local ts = JSON::convert(ti);
local ts = OpenflowJSON::convert(ti);
local if_quotes = (ts[0] == "\"") ? "" : "\"";
tab_parts[|tab_parts|] = cat(if_quotes, ts, if_quotes, ": ", JSON::convert(ta[ti], only_loggable));
tab_parts[|tab_parts|] = cat(if_quotes, ts, if_quotes, ": ", OpenflowJSON::convert(ta[ti], only_loggable));
}
return cat("{", join_string_vec(tab_parts, ", "), "}");
}
@ -108,7 +108,7 @@ function convert(v: any, only_loggable: bool &default=F, field_escape_pattern: p
local va: vector of any = v;
for ( vi in va )
{
vec_parts[|vec_parts|] = JSON::convert(va[vi], only_loggable);
vec_parts[|vec_parts|] = OpenflowJSON::convert(va[vi], only_loggable);
}
return cat("[", join_string_vec(vec_parts, ", "), "]");
}