]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
pgsql: remove unused msg field
authorJuliana Fajardini <jufajardini@oisf.net>
Fri, 15 Dec 2023 16:57:01 +0000 (13:57 -0300)
committerVictor Julien <victor@inliniac.net>
Tue, 19 Dec 2023 08:51:20 +0000 (09:51 +0100)
The `ConsolidatedDataRow` struct had a `length` field that wasn't truly
used.

Related to
Bug #6389

rust/src/pgsql/logger.rs
rust/src/pgsql/parser.rs
rust/src/pgsql/pgsql.rs

index 51f6cb60993bf0c5caeaddb596c61559615caeaa..d54b97b3e1a1938c4af5a5cece60c4306ed1a4b5 100644 (file)
@@ -234,7 +234,6 @@ fn log_response(res: &PgsqlBEMessage, jb: &mut JsonBuilder) -> Result<(), JsonEr
         }
         PgsqlBEMessage::ConsolidatedDataRow(ConsolidatedDataRowPacket {
             identifier: _,
-            length: _,
             row_cnt,
             data_size,
         }) => {
index 345f30a798725c3bd0d2b1bdd6ada4a88307b762..3b8afcabf3066a4c768a4995434444669602951f 100644 (file)
@@ -210,7 +210,6 @@ pub struct BackendKeyDataMessage {
 #[derive(Debug, PartialEq, Eq)]
 pub struct ConsolidatedDataRowPacket {
     pub identifier: u8,
-    pub length: u32,
     pub row_cnt: u16,
     pub data_size: u64,
 }
@@ -924,7 +923,6 @@ pub fn parse_consolidated_data_row(i: &[u8]) -> IResult<&[u8], PgsqlBEMessage> {
     Ok((i, PgsqlBEMessage::ConsolidatedDataRow(
                 ConsolidatedDataRowPacket {
                     identifier,
-                    length,
                     row_cnt: 1,
                     data_size: add_up_data_size(rows),
                 }
index 8ca7f4de6a61a26a83fcaa5583095b6b07266e50..d2d0a02f88da0a87adf5d0187c40ceecee0f9739 100644 (file)
@@ -487,7 +487,6 @@ impl PgsqlState {
                             let dummy_resp =
                                 PgsqlBEMessage::ConsolidatedDataRow(ConsolidatedDataRowPacket {
                                     identifier: b'D',
-                                    length: tx.get_row_cnt() as u32, // TODO this is ugly. We can probably get rid of `length` field altogether...
                                     row_cnt: tx.get_row_cnt(),
                                     data_size: tx.data_size, // total byte count of all data_row messages combined
                                 });