aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ftp: use switch for ftp commands for style

Browse Source
pull/4839/head
Philippe Antoine 5 years ago committed by Victor Julien
parent 6f36403219
commit fef124b92d
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File

63
src/app-layer-ftp.c
Unescape Escape View File

@ -755,27 +755,28 @@ static AppLayerResult FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserS
} }
state->curr_tx = tx; state->curr_tx = tx;
if (state->command == FTP_COMMAND_AUTH_TLS) { uint16_t dyn_port;
if (state->current_line_len >= 4 && SCMemcmp("234 ", state->current_line, 4) == 0) { switch (state->command) {
AppLayerRequestProtocolTLSUpgrade(f); 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) { case FTP_COMMAND_EPRT:
uint16_t dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len); dyn_port = rs_ftp_active_eprt(state->port_line, state->port_line_len);
if (dyn_port == 0) { if (dyn_port == 0) {
goto tx_complete; goto tx_complete;
} }
state->dyn_port = dyn_port; state->dyn_port = dyn_port;
state->active = true; state->active = true;
tx->dyn_port = dyn_port; tx->dyn_port = dyn_port;
tx->active = true; tx->active = true;
SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port); SCLogDebug("FTP active mode (v6): dynamic port %"PRIu16"", dyn_port);
} break;
if (state->command == FTP_COMMAND_PORT) { case FTP_COMMAND_PORT:
if ((flags & STREAM_TOCLIENT)) { dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len);
uint16_t dyn_port = rs_ftp_active_port(state->port_line, state->port_line_len);
if (dyn_port == 0) { if (dyn_port == 0) {
goto tx_complete; goto tx_complete;
} }
@ -784,19 +785,21 @@ static AppLayerResult FTPParseResponse(Flow *f, void *ftp_state, AppLayerParserS
tx->dyn_port = state->dyn_port; tx->dyn_port = state->dyn_port;
tx->active = true; tx->active = true;
SCLogDebug("FTP active mode (v4): dynamic port %"PRIu16"", dyn_port); SCLogDebug("FTP active mode (v4): dynamic port %"PRIu16"", dyn_port);
} break;
}
if (state->command == FTP_COMMAND_PASV) { case FTP_COMMAND_PASV:
if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) { if (state->current_line_len >= 4 && SCMemcmp("227 ", state->current_line, 4) == 0) {
FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len); FTPParsePassiveResponse(f, ftp_state, state->current_line, state->current_line_len);
} }
} break;
if (state->command == FTP_COMMAND_EPSV) { case FTP_COMMAND_EPSV:
if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) { if (state->current_line_len >= 4 && SCMemcmp("229 ", state->current_line, 4) == 0) {
FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len); FTPParsePassiveResponseV6(f, ftp_state, state->current_line, state->current_line_len);
} }
break;
default:
break;
} }
if (likely(state->current_line_len)) { if (likely(state->current_line_len)) {

Write Preview
Loading…
Cancel
Save