app-layer: include decoder events in app-layer tx data

[people/ms/suricata.git] / src / app-layer-ssl.c

diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c
index 5f543561444a1d4e70d9e9318a0278631355d783..3fa5bb0550a7046ec91e3caf812d5639fe8b6093 100644 (file)
--- a/src/app-layer-ssl.c
+++ b/src/app-layer-ssl.c
@@ -240,17 +240,10 @@ void SSLSetEvent(SSLState *ssl_state, uint8_t event)
         return;
     }
 
-    AppLayerDecoderEventsSetEventRaw(&ssl_state->decoder_events, event);
+    AppLayerDecoderEventsSetEventRaw(&ssl_state->tx_data.events, event);
     ssl_state->events++;
 }
 
-static AppLayerDecoderEvents *SSLGetEvents(void *tx)
-{
-    /* for TLS, TX == state, see GetTx */
-    SSLState *ssl_state = (SSLState *)tx;
-    return ssl_state->decoder_events;
-}
-
 static void *SSLGetTx(void *state, uint64_t tx_id)
 {
     SSLState *ssl_state = (SSLState *)state;
@@ -2678,7 +2671,7 @@ static void SSLStateFree(void *p)
     if (ssl_state->server_connp.ja3_hash)
         SCFree(ssl_state->server_connp.ja3_hash);
 
-    AppLayerDecoderEventsFreeEvents(&ssl_state->decoder_events);
+    AppLayerDecoderEventsFreeEvents(&ssl_state->tx_data.events);
 
     if (ssl_state->tx_data.de_state != NULL) {
         DetectEngineStateFree(ssl_state->tx_data.de_state);
@@ -2953,8 +2946,6 @@ void RegisterSSLParsers(void)
 
         AppLayerParserRegisterTxFreeFunc(IPPROTO_TCP, ALPROTO_TLS, SSLStateTransactionFree);
 
-        AppLayerParserRegisterGetEventsFunc(IPPROTO_TCP, ALPROTO_TLS, SSLGetEvents);
-
         AppLayerParserRegisterGetTx(IPPROTO_TCP, ALPROTO_TLS, SSLGetTx);
         AppLayerParserRegisterTxDataFunc(IPPROTO_TCP, ALPROTO_TLS, SSLGetTxData);