ike: don't log empty server objects

pull/13975/head
Jason Ish 3 weeks ago committed by Victor Julien
parent 2848061d0d
commit 5e2dc9ace3

@ -2571,6 +2571,7 @@
"server": {
"type": "object",
"additionalProperties": false,
"minProperties": 1,
"properties": {
"key_exchange_payload": {
"type": "string"

@ -173,6 +173,9 @@ fn log_ikev1(state: &IKEState, tx: &IKETransaction, jb: &mut JsonBuilder) -> Res
jb.close()?; // client
// server data
if !state.ikev1_container.server.key_exchange.is_empty()
|| !state.ikev1_container.server.nonce.is_empty()
{
jb.open_object("server")?;
if !state.ikev1_container.server.key_exchange.is_empty() {
jb.set_string(
@ -187,12 +190,14 @@ fn log_ikev1(state: &IKEState, tx: &IKETransaction, jb: &mut JsonBuilder) -> Res
}
if !state.ikev1_container.server.nonce.is_empty() {
jb.set_string("nonce_payload", &state.ikev1_container.server.nonce)?;
if let Ok(server_nonce_length) = u64::try_from(state.ikev1_container.server.nonce.len())
if let Ok(server_nonce_length) =
u64::try_from(state.ikev1_container.server.nonce.len())
{
jb.set_uint("nonce_payload_length", server_nonce_length / 2)?;
}
}
jb.close()?; // server
}
if !tx.hdr.ikev1_header.vendor_ids.is_empty() {
jb.open_array("vendor_ids")?;

Loading…
Cancel
Save