detect-ssh: cleanup duplicate code

diff --git a/src/detect-ssh-proto.c b/src/detect-ssh-proto.c
index 185b25b9b0d4920ba9b6c1b8827f308eaa58b73f..ac1757388caba93dc36573fbf4184f8663da6768 100644 (file)
--- a/src/detect-ssh-proto.c
+++ b/src/detect-ssh-proto.c
@@ -164,13 +164,8 @@ static int InspectEngineSshProtocol(ThreadVars *tv,
         return DETECT_ENGINE_INSPECT_SIG_MATCH;
 
  end:
-    if (flags & STREAM_TOSERVER) {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    } else {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    }
+    if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
+        return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
     return DETECT_ENGINE_INSPECT_SIG_NO_MATCH;
 }
 

diff --git a/src/detect-ssh-software.c b/src/detect-ssh-software.c
index 528daed4df20b4e586038e62f5b1bb9625daff6b..bf2a7e187643b50464aefe444b8c43b1f787e757 100644 (file)
--- a/src/detect-ssh-software.c
+++ b/src/detect-ssh-software.c
@@ -164,13 +164,8 @@ static int InspectEngineSshSoftware(ThreadVars *tv,
         return DETECT_ENGINE_INSPECT_SIG_MATCH;
 
  end:
-    if (flags & STREAM_TOSERVER) {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    } else {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    }
+    if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
+        return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
     return DETECT_ENGINE_INSPECT_SIG_NO_MATCH;
 }