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

Add interval_as_double argument to control how intervals are converted to JSON

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-12-03 09:15:26 -07:00
parent 8ff10e4d21
commit 43e3de5c79
5 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Val.cc
View file

@ -351,7 +351,7 @@ static bool UsesJSONStringType(const TypePtr& t) {
// This is a static method in this file to avoid including rapidjson's headers
// in Val.h, because they're huge.
static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool only_loggable = false,
RE_Matcher* re = nullptr, const string& key = "") {
RE_Matcher* re = nullptr, const string& key = "", bool interval_as_double = false) {
if ( ! key.empty() )
writer.Key(key);
@ -387,7 +387,6 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
}
case TYPE_PATTERN:
case TYPE_INTERVAL:
case TYPE_ADDR:
case TYPE_SUBNET: {
ODesc d;
@ -397,6 +396,18 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
break;
}
case TYPE_INTERVAL: {
if ( interval_as_double )
writer.Double(val->AsInterval());
else {
ODesc d;
d.SetStyle(RAW_STYLE);
val->Describe(&d);
writer.String(reinterpret_cast<const char*>(d.Bytes()), d.Len());
}
break;
}
case TYPE_FILE:
case TYPE_FUNC:
case TYPE_ENUM:
@ -433,11 +444,11 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
Val* entry_key = lv->Length() == 1 ? lv->Idx(0).get() : lv.get();
if ( tval->GetType()->IsSet() )
BuildJSON(writer, entry_key, only_loggable, re);
BuildJSON(writer, entry_key, only_loggable, re, "", interval_as_double);
else {
rapidjson::StringBuffer buffer;
json::detail::NullDoubleWriter key_writer(buffer);
BuildJSON(key_writer, entry_key, only_loggable, re);
BuildJSON(key_writer, entry_key, only_loggable, re, "", interval_as_double);
string key_str = buffer.GetString();
// Strip the quotes for any type we render as a string. This
@ -446,7 +457,7 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
if ( UsesJSONStringType(entry_key->GetType()) )
key_str = key_str.substr(1, key_str.length() - 2);
BuildJSON(writer, entry->GetVal().get(), only_loggable, re, key_str);
BuildJSON(writer, entry->GetVal().get(), only_loggable, re, key_str, interval_as_double);
}
}
@ -481,7 +492,7 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
else
key_str = field_name;
BuildJSON(writer, value.get(), only_loggable, re, key_str);
BuildJSON(writer, value.get(), only_loggable, re, key_str, interval_as_double);
}
}
@ -495,7 +506,7 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
auto* lval = val->AsListVal();
size_t size = lval->Length();
for ( size_t i = 0; i < size; i++ )
BuildJSON(writer, lval->Idx(i).get(), only_loggable, re);
BuildJSON(writer, lval->Idx(i).get(), only_loggable, re, "", interval_as_double);
writer.EndArray();
break;
@ -507,7 +518,7 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
auto* vval = val->AsVectorVal();
size_t size = vval->SizeVal()->AsCount();
for ( size_t i = 0; i < size; i++ )
BuildJSON(writer, vval->ValAt(i).get(), only_loggable, re);
BuildJSON(writer, vval->ValAt(i).get(), only_loggable, re, "", interval_as_double);
writer.EndArray();
break;
@ -528,11 +539,11 @@ static void BuildJSON(json::detail::NullDoubleWriter& writer, Val* val, bool onl
}
}
StringValPtr Val::ToJSON(bool only_loggable, RE_Matcher* re) {
StringValPtr Val::ToJSON(bool only_loggable, RE_Matcher* re, bool interval_as_double) {
rapidjson::StringBuffer buffer;
json::detail::NullDoubleWriter writer(buffer);
BuildJSON(writer, this, only_loggable, re, "");
BuildJSON(writer, this, only_loggable, re, "", interval_as_double);
return make_intrusive<StringVal>(buffer.GetString());
}