From 02a98f05e73bdf6800980faa4ae244c99faca53c Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Fri, 10 Jul 2020 13:19:35 -0600 Subject: [PATCH] script/dnp3-gen: update generator to reflect in tree changes Some changes were made to the generated files instead of the generator script. Update the script to generate what is in the current state of the in-tree generated files. (cherry picked from commit 4976afd96abf7b8dd49b444ee81df8091668f75e) --- scripts/dnp3-gen/dnp3-gen.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/dnp3-gen/dnp3-gen.py b/scripts/dnp3-gen/dnp3-gen.py index d886cec6aa..be5e8dbb3a 100755 --- a/scripts/dnp3-gen/dnp3-gen.py +++ b/scripts/dnp3-gen/dnp3-gen.py @@ -157,6 +157,7 @@ output_json_dnp3_objects_template = """/* Copyright (C) 2015 Open Information Se #include "app-layer-dnp3.h" #include "app-layer-dnp3-objects.h" #include "output-json-dnp3-objects.h" +#include "output-json.h" #ifdef HAVE_LIBJANSSON @@ -183,7 +184,7 @@ void OutputJsonDNP3SetItem(json_t *js, DNP3Object *object, json_object_set_new(js, "data->{{field.name}}", json_string((char *){{field.name}}_b64)); {% elif field.type == "vstr4" %} - json_object_set_new(js, "data->{{field.name}}", json_string(data->{{field.name}})); + json_object_set_new(js, "data->{{field.name}}", SCJsonString(data->{{field.name}})); {% elif field.type == "chararray" %} if (data->{{field.len_field}} > 0) { /* First create a null terminated string as not all versions @@ -191,7 +192,7 @@ void OutputJsonDNP3SetItem(json_t *js, DNP3Object *object, char tmpbuf[data->{{field.len_field}} + 1]; memcpy(tmpbuf, data->{{field.name}}, data->{{field.len_field}}); tmpbuf[data->{{field.len_field}}] = '\\0'; - json_object_set_new(js, "{{field.name}}", json_string(tmpbuf)); + json_object_set_new(js, "{{field.name}}", SCJsonString(tmpbuf)); } else { json_object_set_new(js, "{{field.name}}", json_string("")); }