From: Victor Julien Date: Thu, 16 Feb 2017 14:38:26 +0000 (+0100) Subject: detect-ssh: cleanup duplicate code X-Git-Tag: suricata-4.0.0-beta1~307 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=955c22712708301f17d128889d7f8629037bb20b;p=thirdparty%2Fsuricata.git detect-ssh: cleanup duplicate code --- diff --git a/src/detect-ssh-proto.c b/src/detect-ssh-proto.c index 185b25b9b0..ac1757388c 100644 --- 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 528daed4df..bf2a7e1876 100644 --- 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; }