diff --git a/scripts/base/utils/json.bro b/scripts/base/utils/json.bro index b6d0093b58..5b66f3ad02 100644 --- a/scripts/base/utils/json.bro +++ b/scripts/base/utils/json.bro @@ -25,6 +25,10 @@ function to_json(v: any, only_loggable: bool &default=F, field_escape_pattern: p case "port": return cat(port_to_count(to_port(cat(v)))); + case "enum": + fallthrough; + case "interval": + fallthrough; case "addr": fallthrough; case "subnet": @@ -37,12 +41,12 @@ function to_json(v: any, only_loggable: bool &default=F, field_escape_pattern: p case "time": fallthrough; case "double": - fallthrough; - case "bool": - fallthrough; - case "enum": return cat(v); + case "bool": + local bval: bool = v; + return bval ? "true" : "false"; + default: break; } diff --git a/testing/btest/Baseline/scripts.base.utils.json/output b/testing/btest/Baseline/scripts.base.utils.json/output index a1f6875417..f7a16cb2bb 100644 --- a/testing/btest/Baseline/scripts.base.utils.json/output +++ b/testing/btest/Baseline/scripts.base.utils.json/output @@ -1,11 +1,11 @@ -T +true 123 -999 1.123457 -1.123456e+308 0 1.0 -"" +"-12.0 hrs" "hello" "" 65535 @@ -17,7 +17,7 @@ T "123.123.123.123" "192.0.0.0/8" "fe80::/64" -Red +"Red" {"s": "test", "c": 100} {"s": "test"} {"s": "test"} @@ -25,7 +25,7 @@ Red [] [2, 1] ["1.2.3.4"] -[[T, F]] +[[true, false]] [{"s": "test"}] [] [2, 1]