]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
sdp: fix logging medias 10994/head
authorPhilippe Antoine <pantoine@oisf.net>
Sat, 27 Apr 2024 20:06:09 +0000 (22:06 +0200)
committerVictor Julien <victor@inliniac.net>
Tue, 30 Apr 2024 14:35:53 +0000 (16:35 +0200)
As introduced by bff790b6ac6f0e5ddf6bd0fe0085881473935c2c

Also handles errors in the caller

Ticket: 6994

rust/src/sdp/logger.rs
rust/src/sip/log.rs

index b5e8cbc6478c14bb9a04df95e68bb14e19d4ac38..43e16049ab598444da591851b1b20553b9aeaf4d 100644 (file)
@@ -107,8 +107,8 @@ fn log_media_description(
             }
             js.close()?;
         }
+        js.close()?;
     }
-    js.close()?;
 
     Ok(())
 }
index 92989ba95e92bf99296d433ca4747a82eaf9d045..058b7850cb696af8c9121159774c49182ea2cc43 100644 (file)
@@ -30,7 +30,7 @@ fn log(tx: &SIPTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
             .set_string("version", &req.version)?;
 
         if let Some(sdp_body) = &req.body {
-            let _ = sdp_log(sdp_body, js);
+            sdp_log(sdp_body, js)?;
         }
     }
 
@@ -43,7 +43,7 @@ fn log(tx: &SIPTransaction, js: &mut JsonBuilder) -> Result<(), JsonError> {
             .set_string("code", &resp.code)?
             .set_string("reason", &resp.reason)?;
         if let Some(sdp_body) = &resp.body {
-            let _ = sdp_log(sdp_body, js);
+            sdp_log(sdp_body, js)?;
         }
     }