detect/files: reuse AppLayerParserSupportsFiles

rather than relisting the protocols
pull/9035/head
Philippe Antoine 2 years ago committed by Victor Julien
parent 83afccd932
commit 71bab65496

@ -197,11 +197,8 @@ static int DetectFiledataSetup (DetectEngineCtx *de_ctx, Signature *s, const cha
SCEnter(); SCEnter();
if (!DetectProtoContainsProto(&s->proto, IPPROTO_TCP) || if (!DetectProtoContainsProto(&s->proto, IPPROTO_TCP) ||
(s->alproto != ALPROTO_UNKNOWN && s->alproto != ALPROTO_HTTP1 && (s->alproto != ALPROTO_UNKNOWN &&
s->alproto != ALPROTO_SMTP && s->alproto != ALPROTO_SMB && !AppLayerParserSupportsFiles(IPPROTO_TCP, s->alproto))) {
s->alproto != ALPROTO_HTTP2 && s->alproto != ALPROTO_FTP &&
s->alproto != ALPROTO_FTPDATA && s->alproto != ALPROTO_HTTP &&
s->alproto != ALPROTO_NFS)) {
SCLogError("rule contains conflicting keywords."); SCLogError("rule contains conflicting keywords.");
return -1; return -1;
} }

Loading…
Cancel
Save