From dbf3d1e9771c55c5b5c485d229acf5e52a21f149 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Thu, 11 Aug 2022 10:09:18 +0200 Subject: [PATCH] tls: make SSLSetEvent a macro to help debugging --- src/app-layer-ssl.c | 20 ++++++++++---------- src/app-layer-ssl.h | 1 - 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index 99ef5d082c..f2fbe80384 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -266,16 +266,16 @@ static inline int SafeMemcpy(void *dst, size_t dst_offset, size_t dst_size, SSLParserHSReset((state)->curr_connp); \ } while(0) -void SSLSetEvent(SSLState *ssl_state, uint8_t event) -{ - if (ssl_state == NULL) { - SCLogDebug("Could not set decoder event: %u", event); - return; - } - - AppLayerDecoderEventsSetEventRaw(&ssl_state->tx_data.events, event); - ssl_state->events++; -} +#define SSLSetEvent(ssl_state, event) \ + do { \ + SCLogDebug("setting event %u", (event)); \ + if ((ssl_state) == NULL) { \ + SCLogDebug("could not set decoder event %u", event); \ + } else { \ + AppLayerDecoderEventsSetEventRaw(&(ssl_state)->tx_data.events, (event)); \ + (ssl_state)->events++; \ + } \ + } while (0) static void *SSLGetTx(void *state, uint64_t tx_id) { diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h index 9c71e949e1..b6ad25dbf0 100644 --- a/src/app-layer-ssl.h +++ b/src/app-layer-ssl.h @@ -270,7 +270,6 @@ typedef struct SSLState_ { void RegisterSSLParsers(void); void SSLParserRegisterTests(void); -void SSLSetEvent(SSLState *ssl_state, uint8_t event); void SSLVersionToString(uint16_t, char *); void SSLEnableJA3(void); bool SSLJA3IsEnabled(void);