From: Juliana Fajardini <jufajardini@oisf.net>
Date: Fri, 4 Apr 2025 21:34:26 +0000 (-0700)
Subject: pgsql: use generic name for TerminationMessage msg
X-Git-Tag: suricata-8.0.0-beta1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef8b13c1ef0f6b001912c2ca337e0d036efb2140;p=thirdparty%2Fsuricata.git

pgsql: use generic name for TerminationMessage msg

Since this structure can be used for different messages with other
meanings.

Related to
Task #4854
---

diff --git a/rust/src/pgsql/logger.rs b/rust/src/pgsql/logger.rs
index 7fb3343654..ae28101431 100644
--- a/rust/src/pgsql/logger.rs
+++ b/rust/src/pgsql/logger.rs
@@ -102,7 +102,7 @@ fn log_request(req: &PgsqlFEMessage, flags: u32) -> Result<JsonBuilder, JsonErro
             js.set_uint("process_id", *pid)?;
             js.set_uint("secret_key", *backend_key)?;
         }
-        PgsqlFEMessage::Terminate(TerminationMessage {
+        PgsqlFEMessage::Terminate(NoPayloadMessage {
             identifier: _,
             length: _,
         }) => {
diff --git a/rust/src/pgsql/parser.rs b/rust/src/pgsql/parser.rs
index 034d3bf2e8..2bddbb1138 100644
--- a/rust/src/pgsql/parser.rs
+++ b/rust/src/pgsql/parser.rs
@@ -278,7 +278,7 @@ pub struct CopyOutResponse {
 }
 
 #[derive(Debug, PartialEq, Eq)]
-pub struct TerminationMessage {
+pub struct NoPayloadMessage {
     pub identifier: u8,
     pub length: u32,
 }
@@ -300,7 +300,7 @@ pub enum PgsqlBEMessage {
     CommandComplete(RegularPacket),
     CopyOutResponse(CopyOutResponse),
     ConsolidatedCopyDataOut(ConsolidatedDataRowPacket),
-    CopyDone(TerminationMessage),
+    CopyDone(NoPayloadMessage),
     ReadyForQuery(ReadyForQueryMessage),
     RowDescription(RowDescriptionMessage),
     ConsolidatedDataRow(ConsolidatedDataRowPacket),
@@ -384,7 +384,7 @@ pub enum PgsqlFEMessage {
     SASLResponse(RegularPacket),
     SimpleQuery(RegularPacket),
     CancelRequest(CancelRequestMessage),
-    Terminate(TerminationMessage),
+    Terminate(NoPayloadMessage),
     UnknownMessageType(RegularPacket),
 }
 
@@ -776,7 +776,7 @@ fn parse_terminate_message(i: &[u8]) -> IResult<&[u8], PgsqlFEMessage, PgsqlPars
     let (i, length) = parse_exact_length(i, PGSQL_LENGTH_FIELD)?;
     Ok((
         i,
-        PgsqlFEMessage::Terminate(TerminationMessage { identifier, length }),
+        PgsqlFEMessage::Terminate(NoPayloadMessage { identifier, length }),
     ))
 }
 
@@ -1066,7 +1066,7 @@ fn parse_copy_done(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage, PgsqlParseError<&
     let (i, identifier) = verify(be_u8, |&x| x == b'c')(i)?;
     let (i, length) = parse_exact_length(i, PGSQL_LENGTH_FIELD)?;
     Ok((
-        i, PgsqlBEMessage::CopyDone(TerminationMessage {
+        i, PgsqlBEMessage::CopyDone(NoPayloadMessage {
             identifier,
             length
         })