app-layer/rust: don't use option for GetTxDataFn anymore

diff --git a/rust/src/applayer.rs b/rust/src/applayer.rs
index f4ad113dcc7c9422a98bf0ad30c3bd7a2e0a0eac..b1a6fc9e6027e9afa6eb2f4486c4614011842d7f 100644 (file)
--- a/rust/src/applayer.rs
+++ b/rust/src/applayer.rs
@@ -227,7 +227,7 @@ pub struct RustParser {
     // Function to get TX detect flags.
     pub get_tx_detect_flags: Option<GetTxDetectFlagsFn>,
 
-    pub get_tx_data: Option<GetTxDataFn>,
+    pub get_tx_data: GetTxDataFn,
 
     // Function to apply config to a TX. Optional. Normal (bidirectional)
     // transactions don't need to set this. It is meant for cases where

diff --git a/rust/src/applayertemplate/template.rs b/rust/src/applayertemplate/template.rs
index 97826a0994aae6a188eb8252dfce078265460ca9..33c4da128bfcddaf7ec01c0d5a025a7a539dfb7d 100644 (file)
--- a/rust/src/applayertemplate/template.rs
+++ b/rust/src/applayertemplate/template.rs
@@ -518,7 +518,7 @@ pub unsafe extern "C" fn rs_template_register_parser() {
         get_tx_iterator: Some(rs_template_state_get_tx_iterator),
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data: Some(rs_template_get_tx_data),
+        get_tx_data: rs_template_get_tx_data,
         apply_tx_config: None,
     };
 

diff --git a/rust/src/dhcp/dhcp.rs b/rust/src/dhcp/dhcp.rs
index a87b292485c58070197d0994af91f27054c05505..27750c60a47e65f073c3c7176520a5aeada1be6b 100644 (file)
--- a/rust/src/dhcp/dhcp.rs
+++ b/rust/src/dhcp/dhcp.rs
@@ -437,7 +437,7 @@ pub unsafe extern "C" fn rs_dhcp_register_parser() {
         get_tx_iterator    : Some(rs_dhcp_state_get_tx_iterator),
         set_tx_detect_flags: None,
         get_tx_detect_flags: None,
-        get_tx_data        : Some(rs_dhcp_get_tx_data),
+        get_tx_data        : rs_dhcp_get_tx_data,
         apply_tx_config    : None,
     };
 

diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs
index e54b8cb3cb15155022cf0a33d10105dbcdee19e2..1c721ae5eb3a58bc20f2c01c866406d6a241bc89 100644 (file)
--- a/rust/src/dns/dns.rs
+++ b/rust/src/dns/dns.rs
@@ -980,7 +980,7 @@ pub unsafe extern "C" fn rs_dns_udp_register_parser() {
         set_tx_detect_flags: None,
         get_de_state: rs_dns_state_get_tx_detect_state,
         set_de_state: rs_dns_state_set_tx_detect_state,
-        get_tx_data: Some(rs_dns_state_get_tx_data),
+        get_tx_data: rs_dns_state_get_tx_data,
         apply_tx_config: None,
     };
 
@@ -1025,7 +1025,7 @@ pub unsafe extern "C" fn rs_dns_tcp_register_parser() {
         set_tx_detect_flags: None,
         get_de_state: rs_dns_state_get_tx_detect_state,
         set_de_state: rs_dns_state_set_tx_detect_state,
-        get_tx_data: Some(rs_dns_state_get_tx_data),
+        get_tx_data: rs_dns_state_get_tx_data,
         apply_tx_config: None,
     };
 

diff --git a/rust/src/ikev2/ikev2.rs b/rust/src/ikev2/ikev2.rs
index 2f6a911ebc524ce58569ef09d400fb07c1ac99ff..a51d00f9491a97c9eb5313e29ce11c9bbc0bb39a 100644 (file)
--- a/rust/src/ikev2/ikev2.rs
+++ b/rust/src/ikev2/ikev2.rs
@@ -712,7 +712,7 @@ pub unsafe extern "C" fn rs_register_ikev2_parser() {
         get_tx_iterator    : None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data        : Some(rs_ikev2_get_tx_data),
+        get_tx_data        : rs_ikev2_get_tx_data,
         apply_tx_config    : None,
     };
 

diff --git a/rust/src/krb/krb5.rs b/rust/src/krb/krb5.rs
index 424017603936ff9fb6550181d537371bbb8d2687..499029189f22bfe511ed66c61a34c38a751253cb 100644 (file)
--- a/rust/src/krb/krb5.rs
+++ b/rust/src/krb/krb5.rs
@@ -658,7 +658,7 @@ pub unsafe extern "C" fn rs_register_krb5_parser() {
         get_tx_iterator    : None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data        : Some(rs_krb5_get_tx_data),
+        get_tx_data        : rs_krb5_get_tx_data,
         apply_tx_config    : None,
     };
     // register UDP parser

diff --git a/rust/src/ntp/ntp.rs b/rust/src/ntp/ntp.rs
index 64a9035f54cbb2c0d872cfc7cd5c67f234dd96f9..405efab0ef1bf866b1a79f295e4e6855505f0328 100644 (file)
--- a/rust/src/ntp/ntp.rs
+++ b/rust/src/ntp/ntp.rs
@@ -408,7 +408,7 @@ pub unsafe extern "C" fn rs_register_ntp_parser() {
         get_tx_iterator    : None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data        : Some(rs_ntp_get_tx_data),
+        get_tx_data        : rs_ntp_get_tx_data,
         apply_tx_config    : None,
     };
 

diff --git a/rust/src/rdp/rdp.rs b/rust/src/rdp/rdp.rs
index cfa813910f4a3801026e0abe3bce0bfb90af83a0..147aa6a3e25247a48bf90edc27b849249eacac1a 100644 (file)
--- a/rust/src/rdp/rdp.rs
+++ b/rust/src/rdp/rdp.rs
@@ -534,7 +534,7 @@ pub unsafe extern "C" fn rs_rdp_register_parser() {
         get_tx_iterator: None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data: Some(rs_rdp_get_tx_data),
+        get_tx_data: rs_rdp_get_tx_data,
         apply_tx_config: None,
     };
 

diff --git a/rust/src/rfb/rfb.rs b/rust/src/rfb/rfb.rs
index fad695be443495a2240ec1d0e61e1de67cf06d6f..bc3424c9f264f0021e2b361380060da6d58dfebe 100644 (file)
--- a/rust/src/rfb/rfb.rs
+++ b/rust/src/rfb/rfb.rs
@@ -700,7 +700,7 @@ pub unsafe extern "C" fn rs_rfb_register_parser() {
         get_tx_iterator: Some(rs_rfb_state_get_tx_iterator),
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data: Some(rs_rfb_get_tx_data),
+        get_tx_data: rs_rfb_get_tx_data,
         apply_tx_config: None,
     };
 

diff --git a/rust/src/sip/sip.rs b/rust/src/sip/sip.rs
index c1f1b8fa16fcb7e248dd49a9b5643e28a469e612..3c4563d67402329fc3d1215fd2b992585a63939f 100755 (executable)
--- a/rust/src/sip/sip.rs
+++ b/rust/src/sip/sip.rs
@@ -393,7 +393,7 @@ pub unsafe extern "C" fn rs_sip_register_parser() {
         get_tx_iterator: None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data: Some(rs_sip_get_tx_data),
+        get_tx_data: rs_sip_get_tx_data,
         apply_tx_config: None,
     };
 

diff --git a/rust/src/snmp/snmp.rs b/rust/src/snmp/snmp.rs
index 3c976d5defc51ff5c879a59ce96960e5ce9d2219..55a7f2c73c333539e034d31a29b7618f2abe38eb 100644 (file)
--- a/rust/src/snmp/snmp.rs
+++ b/rust/src/snmp/snmp.rs
@@ -586,7 +586,7 @@ pub unsafe extern "C" fn rs_register_snmp_parser() {
         get_tx_iterator    : None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data        : Some(rs_snmp_get_tx_data),
+        get_tx_data        : rs_snmp_get_tx_data,
         apply_tx_config    : None,
     };
     let ip_proto_str = CString::new("udp").unwrap();

diff --git a/rust/src/ssh/ssh.rs b/rust/src/ssh/ssh.rs
index 1b5d5cea69e452c4feee020656ffda7e81f51d81..55b71b317e1870f19bc1d78d80dbcbfb595267a7 100644 (file)
--- a/rust/src/ssh/ssh.rs
+++ b/rust/src/ssh/ssh.rs
@@ -560,7 +560,7 @@ pub unsafe extern "C" fn rs_ssh_register_parser() {
         get_tx_iterator: None,
         get_tx_detect_flags: None,
         set_tx_detect_flags: None,
-        get_tx_data: Some(rs_ssh_get_tx_data),
+        get_tx_data: rs_ssh_get_tx_data,
         apply_tx_config: None,
     };