From fef124b92dbabe64c6f1580113a251fae639857f Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 16 Mar 2020 14:52:32 +0100 Subject: [PATCH] ftp: use switch for ftp commands for style --- src/app-layer-ftp.c | 63 ++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c index 2a9c191ecb..ef1fb0d5b0 100644 --- a/src/app-layer-ftp.c +++ b/src/app-layer-ftp.c @@ -755,27 +755,28 @@ static AppLayerResult FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserS } state->curr_tx = tx; - if (state->command == FTP_COMMAND_AUTH_TLS) { - if (state->current_line_len >= 4 && SCMemcmp("234 ", state->current_line, 4) == 0) { - AppLayerRequestProtocolTLSUpgrade(f); - } - } + uint16_t dyn_port; + switch (state->command) { + case FTP_COMMAND_AUTH_TLS: + if (state->current_line_len >= 4 && SCMemcmp("234 ", state->current_line, 4) == 0) { + AppLayerRequestProtocolTLSUpgrade(f); + } + break; - if (state->command == FTP_COMMAND_EPRT) { - uint16_t dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len); - if (dyn_port == 0) { - goto tx_complete; - } - state->dyn_port = dyn_port; - state->active = true; - tx->dyn_port = dyn_port; - tx->active = true; - SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port); - } + case FTP_COMMAND_EPRT: + dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len); + if (dyn_port == 0) { + goto tx_complete; + } + state->dyn_port = dyn_port; + state->active = true; + tx->dyn_port = dyn_port; + tx->active = true; + SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port); + break; - if (state->command == FTP_COMMAND_PORT) { - if ((flags & STREAM_TOCLIENT)) { - uint16_t dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len); + case FTP_COMMAND_PORT: + dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len); if (dyn_port == 0) { goto tx_complete; } @@ -784,19 +785,21 @@ static AppLayerResult FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserS tx->dyn_port = state->dyn_port; tx->active = true; SCLogDebug("FTP active mode (v4): dynamic port %"PRIu16"", dyn_port); - } - } + break; - if (state->command == FTP_COMMAND_PASV) { - if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) { - FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len); - } - } + case FTP_COMMAND_PASV: + if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) { + FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len); + } + break; - if (state->command == FTP_COMMAND_EPSV) { - if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) { - FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len); - } + case FTP_COMMAND_EPSV: + if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) { + FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len); + } + break; + default: + break; } if (likely(state->current_line_len)) {