detect-tls: remove confusing underscores from variables

Remove confusing underscore prefix from variables in GetData() for
all tls keywords.

diff --git a/src/detect-tls-cert-fingerprint.c b/src/detect-tls-cert-fingerprint.c
index 6b803d375c4cad0de6db52f30819697e19a862a9..7b685de8c2c01dc7ff1d39aaf9afc318df68a79d 100644 (file)
--- a/src/detect-tls-cert-fingerprint.c
+++ b/src/detect-tls-cert-fingerprint.c
@@ -58,7 +58,7 @@ static int DetectTlsFingerprintSetup(DetectEngineCtx *, Signature *, const char
 static void DetectTlsFingerprintRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms,
-        Flow *_f, const uint8_t _flow_flags,
+        Flow *f, const uint8_t flow_flags,
         void *txv, const int list_id);
 static void DetectTlsFingerprintSetupCallback(const DetectEngineCtx *de_ctx,
         Signature *s);
@@ -124,12 +124,12 @@ static int DetectTlsFingerprintSetup(DetectEngineCtx *de_ctx, Signature *s,
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->server_connp.cert0_fingerprint == NULL) {
             return NULL;

diff --git a/src/detect-tls-cert-issuer.c b/src/detect-tls-cert-issuer.c
index 8f3dd2d5906d8aa50334d17a85bf2dfe6aba797a..6aedcebed95976200f24516c39a1f48a837423ca 100644 (file)
--- a/src/detect-tls-cert-issuer.c
+++ b/src/detect-tls-cert-issuer.c
@@ -58,7 +58,7 @@ static int DetectTlsIssuerSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectTlsIssuerRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms,
-        Flow *_f, const uint8_t _flow_flags,
+        Flow *f, const uint8_t flow_flags,
         void *txv, const int list_id);
 static int g_tls_cert_issuer_buffer_id = 0;
 
@@ -111,12 +111,12 @@ static int DetectTlsIssuerSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->server_connp.cert0_issuerdn == NULL) {
             return NULL;

diff --git a/src/detect-tls-cert-serial.c b/src/detect-tls-cert-serial.c
index 624c40298deb35d2365bf26c622db24926e99230..4f34998aafdaf87c68215bc25a33e8f48ccd35c1 100644 (file)
--- a/src/detect-tls-cert-serial.c
+++ b/src/detect-tls-cert-serial.c
@@ -58,7 +58,7 @@ static int DetectTlsSerialSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectTlsSerialRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms,
-        Flow *_f, const uint8_t _flow_flags,
+        Flow *f, const uint8_t flow_flags,
         void *txv, const int list_id);
 static void DetectTlsSerialSetupCallback(const DetectEngineCtx *de_ctx,
         Signature *s);
@@ -123,12 +123,12 @@ static int DetectTlsSerialSetup(DetectEngineCtx *de_ctx, Signature *s, const cha
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->server_connp.cert0_serial == NULL) {
             return NULL;

diff --git a/src/detect-tls-cert-subject.c b/src/detect-tls-cert-subject.c
index 3c1c4c977216c013814f9e09d85769e1b85f0f7e..ba30018696b3408562745d4b121e16ea1fb539c3 100644 (file)
--- a/src/detect-tls-cert-subject.c
+++ b/src/detect-tls-cert-subject.c
@@ -58,7 +58,7 @@ static int DetectTlsSubjectSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectTlsSubjectRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
         const DetectEngineTransforms *transforms,
-        Flow *_f, const uint8_t _flow_flags,
+        Flow *f, const uint8_t flow_flags,
         void *txv, const int list_id);
 static int g_tls_cert_subject_buffer_id = 0;
 
@@ -110,12 +110,12 @@ static int DetectTlsSubjectSetup(DetectEngineCtx *de_ctx, Signature *s, const ch
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->server_connp.cert0_subject == NULL) {
             return NULL;

diff --git a/src/detect-tls-ja3-hash.c b/src/detect-tls-ja3-hash.c
index ef1453c82329a4a7b0fc89e1d95995df1dc36d68..5ecde459a98089fc2262d6112a9b275e63830b57 100644 (file)
--- a/src/detect-tls-ja3-hash.c
+++ b/src/detect-tls-ja3-hash.c
@@ -62,7 +62,7 @@ static int DetectTlsJa3HashSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectTlsJa3HashRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
        const DetectEngineTransforms *transforms,
-       Flow *_f, const uint8_t _flow_flags,
+       Flow *f, const uint8_t flow_flags,
        void *txv, const int list_id);
 static void DetectTlsJa3HashSetupCallback(const DetectEngineCtx *de_ctx,
        Signature *s);
@@ -129,12 +129,12 @@ static int DetectTlsJa3HashSetup(DetectEngineCtx *de_ctx, Signature *s, const ch
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->ja3_hash == NULL) {
             return NULL;

diff --git a/src/detect-tls-ja3-string.c b/src/detect-tls-ja3-string.c
index d58359ecbcd84079398d7f47d3674def18a5f6e0..5fd7cd5e47bca0e25e48ef735bd7c8d589977a79 100644 (file)
--- a/src/detect-tls-ja3-string.c
+++ b/src/detect-tls-ja3-string.c
@@ -62,7 +62,7 @@ static int DetectTlsJa3StringSetup(DetectEngineCtx *, Signature *, const char *)
 static void DetectTlsJa3StringRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
        const DetectEngineTransforms *transforms,
-       Flow *_f, const uint8_t _flow_flags,
+       Flow *f, const uint8_t flow_flags,
        void *txv, const int list_id);
 static int g_tls_ja3_str_buffer_id = 0;
 
@@ -119,12 +119,12 @@ static int DetectTlsJa3StringSetup(DetectEngineCtx *de_ctx, Signature *s, const
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->ja3_str == NULL ||
                 ssl_state->ja3_str->data == NULL) {

diff --git a/src/detect-tls-sni.c b/src/detect-tls-sni.c
index d333c47fabf0119f4b2b86cf79f0f6d7ce3e480a..969b9d78ab06fa3e85b1949db4689395a824ace9 100644 (file)
--- a/src/detect-tls-sni.c
+++ b/src/detect-tls-sni.c
@@ -58,7 +58,7 @@ static int DetectTlsSniSetup(DetectEngineCtx *, Signature *, const char *);
 static void DetectTlsSniRegisterTests(void);
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
        const DetectEngineTransforms *transforms,
-       Flow *_f, const uint8_t _flow_flags,
+       Flow *f, const uint8_t flow_flags,
        void *txv, const int list_id);
 static int g_tls_sni_buffer_id = 0;
 
@@ -109,12 +109,12 @@ static int DetectTlsSniSetup(DetectEngineCtx *de_ctx, Signature *s, const char *
 }
 
 static InspectionBuffer *GetData(DetectEngineThreadCtx *det_ctx,
-        const DetectEngineTransforms *transforms, Flow *_f,
-        const uint8_t _flow_flags, void *txv, const int list_id)
+        const DetectEngineTransforms *transforms, Flow *f,
+        const uint8_t flow_flags, void *txv, const int list_id)
 {
     InspectionBuffer *buffer = InspectionBufferGet(det_ctx, list_id);
     if (buffer->inspect == NULL) {
-        SSLState *ssl_state = (SSLState *)_f->alstate;
+        SSLState *ssl_state = (SSLState *)f->alstate;
 
         if (ssl_state->client_connp.sni == NULL) {
             return NULL;