ftp: reenable debug check; improve debug log

pull/9320/head
Victor Julien 3 years ago committed by Victor Julien
parent 33fca4d4db
commit 4e19454152

@ -1067,8 +1067,7 @@ static AppLayerResult FTPDataParse(Flow *f, FtpDataState *ftpdata_state,
} else { } else {
if (ftpdata_state->state == FTPDATA_STATE_FINISHED) { if (ftpdata_state->state == FTPDATA_STATE_FINISHED) {
SCLogDebug("state is already finished"); SCLogDebug("state is already finished");
// TODO put back the assert after deciding on the bug... DEBUG_VALIDATE_BUG_ON(input_len); // data after state finished is a bug.
// DEBUG_VALIDATE_BUG_ON(input_len); // data after state finished is a bug.
SCReturnStruct(APP_LAYER_OK); SCReturnStruct(APP_LAYER_OK);
} }
if ((direction & ftpdata_state->direction) == 0) { if ((direction & ftpdata_state->direction) == 0) {
@ -1099,7 +1098,7 @@ static AppLayerResult FTPDataParse(Flow *f, FtpDataState *ftpdata_state,
if (eof) { if (eof) {
ret = FileCloseFile(ftpdata_state->files, &sbcfg, NULL, 0, flags); ret = FileCloseFile(ftpdata_state->files, &sbcfg, NULL, 0, flags);
ftpdata_state->state = FTPDATA_STATE_FINISHED; ftpdata_state->state = FTPDATA_STATE_FINISHED;
SCLogDebug("closed because of eof"); SCLogDebug("closed because of eof: state now FTPDATA_STATE_FINISHED");
} }
out: out:
if (ret < 0) { if (ret < 0) {

Loading…
Cancel
Save