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

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

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,
     };
 

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,
     };
 

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,
     };
 

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,
     };
 

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

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,
     };
 

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,
     };
 

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,
     };
 

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,
     };
 

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();

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,
     };