From: Pierre Chifflier <chifflier@wzdftpd.net>
Date: Thu, 15 Mar 2018 13:06:08 +0000 (+0100)
Subject: IKEv2: Use JSON arrays instead of comma-separated values
X-Git-Tag: suricata-4.1.0-rc1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d222b9ae6c0a8d64f6a6f0d9ff832494b3a88605;p=thirdparty%2Fsuricata.git

IKEv2: Use JSON arrays instead of comma-separated values
---

diff --git a/rust/src/ikev2/log.rs b/rust/src/ikev2/log.rs
index 7e8da40553..ef9ad65736 100644
--- a/rust/src/ikev2/log.rs
+++ b/rust/src/ikev2/log.rs
@@ -43,15 +43,15 @@ pub extern "C" fn rs_ikev2_log_json_response(state: &mut IKEV2State, tx: &mut IK
         js.set_string("alg_esn", &format!("{:?}", state.alg_esn));
     }
     js.set_integer("errors", tx.errors as u64);
-    let payload_list : Vec<String> = tx.payload_types.iter()
-        .map(|x| format!("{:?}", x))
-        .collect();
-    let payload_list = payload_list.join(",");
-    js.set_string("payload_list", &payload_list);
-    let notify_list : Vec<String> = tx.notify_types.iter()
-        .map(|x| format!("{:?}", x))
-        .collect();
-    let notify_list = notify_list.join(",");
-    js.set_string("notify_list", &notify_list);
+    let jsa = Json::array();
+    for payload in tx.payload_types.iter() {
+        jsa.array_append_string(&format!("{:?}", payload));
+    }
+    js.set("payload", jsa);
+    let jsa = Json::array();
+    for notify in tx.notify_types.iter() {
+        jsa.array_append_string(&format!("{:?}", notify));
+    }
+    js.set("notify", jsa);
     return js.unwrap();
 }