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

detect: remove unused arg from generic list inspect

Browse Source
pull/5636/head
Victor Julien 6 years ago
parent d694dac5a8
commit 84385549fe
29 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File

2
src/detect-dce-iface.c
Unescape Escape View File

@ -100,7 +100,7 @@ static int InspectDceGeneric(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-dnp3.c
Unescape Escape View File

@ -181,7 +181,7 @@ static int DetectEngineInspectDNP3(DetectEngineCtx *de_ctx, DetectEngineThreadCt
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-dns-opcode.c
Unescape Escape View File

@ -79,7 +79,7 @@ static int DetectEngineInspectRequestGenericDnsOpcode(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
void DetectDnsOpcodeRegister(void)

4
src/detect-engine-dns.c
Unescape Escape View File

@ -52,7 +52,7 @@ int DetectEngineInspectDnsRequest(DetectEngineCtx *de_ctx, DetectEngineThreadCtx
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
int DetectEngineInspectDnsResponse(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
@ -60,5 +60,5 @@ int DetectEngineInspectDnsResponse(DetectEngineCtx *de_ctx, DetectEngineThreadCt
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}

9
src/detect-engine.c
Unescape Escape View File

@ -1529,12 +1529,9 @@ int DetectEngineReloadIsIdle(void)
* \retval 0 no match
* \retval 1 match
*/
int DetectEngineInspectGenericList(ThreadVars *tv,
const DetectEngineCtx *de_ctx,
DetectEngineThreadCtx *det_ctx,
const Signature *s, const SigMatchData *smd,
Flow *f, const uint8_t flags,
void *alstate, void *txv, uint64_t tx_id)
int DetectEngineInspectGenericList(const DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,
const Signature *s, const SigMatchData *smd, Flow *f, const uint8_t flags, void *alstate,
void *txv, uint64_t tx_id)
{
SCLogDebug("running match functions, sm %p", smd);
if (smd != NULL) {

7
src/detect-engine.h
Unescape Escape View File

@ -114,11 +114,8 @@ int DetectEngineTentantUnregisterVlanId(uint32_t tenant_id, uint16_t vlan_id);
int DetectEngineTentantRegisterPcapFile(uint32_t tenant_id);
int DetectEngineTentantUnregisterPcapFile(uint32_t tenant_id);
int DetectEngineInspectGenericList(ThreadVars *, const DetectEngineCtx *,
DetectEngineThreadCtx *,
const Signature *, const SigMatchData *,
Flow *, const uint8_t, void *, void *,
uint64_t);
int DetectEngineInspectGenericList(const DetectEngineCtx *, DetectEngineThreadCtx *,
const Signature *, const SigMatchData *, Flow *, const uint8_t, void *, void *, uint64_t);
int DetectEngineInspectBufferGeneric(
DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx,

2
src/detect-ftpbounce.c
Unescape Escape View File

@ -88,7 +88,7 @@ static int InspectFtpRequest(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-ftpdata.c
Unescape Escape View File

@ -92,7 +92,7 @@ static int DetectEngineInspectFtpdataGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-http2.c
Unescape Escape View File

@ -116,7 +116,7 @@ static int DetectEngineInspectHTTP2(DetectEngineCtx *de_ctx, DetectEngineThreadC
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-krb5-errcode.c
Unescape Escape View File

@ -91,7 +91,7 @@ static int DetectEngineInspectKRB5Generic(DetectEngineCtx *de_ctx, DetectEngineT
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-krb5-msgtype.c
Unescape Escape View File

@ -91,7 +91,7 @@ static int DetectEngineInspectKRB5Generic(DetectEngineCtx *de_ctx, DetectEngineT
void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-lua.c
Unescape Escape View File

@ -139,7 +139,7 @@ static int InspectSmtpGeneric(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *de
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
#define DATATYPE_PACKET (1<<0)

2
src/detect-mqtt-connack-sessionpresent.c
Unescape Escape View File

@ -77,7 +77,7 @@ static int DetectEngineInspectMQTTConnackSessionPresentGeneric(DetectEngineCtx *
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-connect-flags.c
Unescape Escape View File

@ -85,7 +85,7 @@ static int DetectEngineInspectMQTTConnectFlagsGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-flags.c
Unescape Escape View File

@ -81,7 +81,7 @@ static int DetectEngineInspectMQTTFlagsGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-protocol-version.c
Unescape Escape View File

@ -74,7 +74,7 @@ static int DetectEngineInspectMQTTProtocolVersionGeneric(DetectEngineCtx *de_ctx
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-qos.c
Unescape Escape View File

@ -73,7 +73,7 @@ static int DetectEngineInspectMQTTQosGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-reason-code.c
Unescape Escape View File

@ -79,7 +79,7 @@ static int DetectEngineInspectMQTTReasonCodeGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-mqtt-type.c
Unescape Escape View File

@ -72,7 +72,7 @@ static int DetectEngineInspectMQTTTypeGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-nfs-procedure.c
Unescape Escape View File

@ -115,7 +115,7 @@ static int DetectEngineInspectNfsRequestGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
static inline int

2
src/detect-nfs-version.c
Unescape Escape View File

@ -114,7 +114,7 @@ static int DetectEngineInspectNfsRequestGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
static inline int

2
src/detect-rfb-secresult.c
Unescape Escape View File

@ -82,7 +82,7 @@ static int DetectEngineInspectRfbSecresultGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
enum {

2
src/detect-rfb-sectype.c
Unescape Escape View File

@ -89,7 +89,7 @@ static int DetectEngineInspectRfbSectypeGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
static inline int SectypeMatch(const uint32_t version,

2
src/detect-snmp-pdu_type.c
Unescape Escape View File

@ -86,7 +86,7 @@ static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-snmp-version.c
Unescape Escape View File

@ -98,7 +98,7 @@ static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
static inline int

2
src/detect-ssh-software-version.c
Unescape Escape View File

@ -81,7 +81,7 @@ static int InspectSshBanner(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

2
src/detect-ssl-state.c
Unescape Escape View File

@ -105,7 +105,7 @@ static int InspectTlsGeneric(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

3
src/detect-tls-cert-validity.c
Unescape Escape View File

@ -139,8 +139,9 @@ static int DetectEngineInspectTlsValidity(DetectEngineCtx *de_ctx, DetectEngineT
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**
* \internal
* \brief Function to match validity field in a tls certificate.

2
src/detect-tls.c
Unescape Escape View File

@ -100,7 +100,7 @@ static int InspectTlsCert(DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ct
uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
{
return DetectEngineInspectGenericList(
NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
}
/**

Write Preview
Loading…
Cancel
Save