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

detect/snmp: convert to v2 inspect API

Browse Source
pull/5635/head
Victor Julien 5 years ago
parent 962230040a
commit 86686eff17
2 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -49,11 +49,9 @@ static void DetectSNMPPduTypeRegisterTests(void);
#endif #endif
static int g_snmp_pdu_type_buffer_id = 0; static int g_snmp_pdu_type_buffer_id = 0;
static int DetectEngineInspectSNMPRequestGeneric(ThreadVars *tv, static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, DetectEngineThreadCtx *det_ctx, const struct DetectEngineAppInspectionEngine_ *engine,
const Signature *s, const SigMatchData *smd, const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id);
Flow *f, uint8_t flags, void *alstate,
void *txv, uint64_t tx_id);
static int DetectSNMPPduTypeMatch (DetectEngineThreadCtx *, Flow *, static int DetectSNMPPduTypeMatch (DetectEngineThreadCtx *, Flow *,
uint8_t, void *, void *, const Signature *, uint8_t, void *, void *, const Signature *,
@ -74,25 +72,21 @@ void DetectSNMPPduTypeRegister(void)
DetectSetupParseRegexes(PARSE_REGEX, &parse_regex); DetectSetupParseRegexes(PARSE_REGEX, &parse_regex);
DetectAppLayerInspectEngineRegister("snmp.pdu_type", DetectAppLayerInspectEngineRegister2("snmp.pdu_type", ALPROTO_SNMP, SIG_FLAG_TOSERVER, 0,
ALPROTO_SNMP, SIG_FLAG_TOSERVER, 0, DetectEngineInspectSNMPRequestGeneric, NULL);
DetectEngineInspectSNMPRequestGeneric);
DetectAppLayerInspectEngineRegister("snmp.pdu_type", DetectAppLayerInspectEngineRegister2("snmp.pdu_type", ALPROTO_SNMP, SIG_FLAG_TOCLIENT, 0,
ALPROTO_SNMP, SIG_FLAG_TOCLIENT, 0, DetectEngineInspectSNMPRequestGeneric, NULL);
DetectEngineInspectSNMPRequestGeneric);
g_snmp_pdu_type_buffer_id = DetectBufferTypeGetByName("snmp.pdu_type"); g_snmp_pdu_type_buffer_id = DetectBufferTypeGetByName("snmp.pdu_type");
} }
static int DetectEngineInspectSNMPRequestGeneric(ThreadVars *tv, static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, DetectEngineThreadCtx *det_ctx, const struct DetectEngineAppInspectionEngine_ *engine,
const Signature *s, const SigMatchData *smd, const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
Flow *f, uint8_t flags, void *alstate,
void *txv, uint64_t tx_id)
{ {
return DetectEngineInspectGenericList(tv, de_ctx, det_ctx, s, smd, return DetectEngineInspectGenericList(
f, flags, alstate, txv, tx_id); NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
} }
/** /**

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

@ -58,11 +58,9 @@ static void DetectSNMPVersionRegisterTests(void);
#endif #endif
static int g_snmp_version_buffer_id = 0; static int g_snmp_version_buffer_id = 0;
static int DetectEngineInspectSNMPRequestGeneric(ThreadVars *tv, static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, DetectEngineThreadCtx *det_ctx, const struct DetectEngineAppInspectionEngine_ *engine,
const Signature *s, const SigMatchData *smd, const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id);
Flow *f, uint8_t flags, void *alstate,
void *txv, uint64_t tx_id);
static int DetectSNMPVersionMatch (DetectEngineThreadCtx *, Flow *, static int DetectSNMPVersionMatch (DetectEngineThreadCtx *, Flow *,
uint8_t, void *, void *, const Signature *, uint8_t, void *, void *, const Signature *,
@ -86,25 +84,21 @@ void DetectSNMPVersionRegister (void)
DetectSetupParseRegexes(PARSE_REGEX, &parse_regex); DetectSetupParseRegexes(PARSE_REGEX, &parse_regex);
DetectAppLayerInspectEngineRegister("snmp.version", DetectAppLayerInspectEngineRegister2("snmp.version", ALPROTO_SNMP, SIG_FLAG_TOSERVER, 0,
ALPROTO_SNMP, SIG_FLAG_TOSERVER, 0, DetectEngineInspectSNMPRequestGeneric, NULL);
DetectEngineInspectSNMPRequestGeneric);
DetectAppLayerInspectEngineRegister("snmp.version", DetectAppLayerInspectEngineRegister2("snmp.version", ALPROTO_SNMP, SIG_FLAG_TOCLIENT, 0,
ALPROTO_SNMP, SIG_FLAG_TOCLIENT, 0, DetectEngineInspectSNMPRequestGeneric, NULL);
DetectEngineInspectSNMPRequestGeneric);
g_snmp_version_buffer_id = DetectBufferTypeGetByName("snmp.version"); g_snmp_version_buffer_id = DetectBufferTypeGetByName("snmp.version");
} }
static int DetectEngineInspectSNMPRequestGeneric(ThreadVars *tv, static int DetectEngineInspectSNMPRequestGeneric(DetectEngineCtx *de_ctx,
DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, DetectEngineThreadCtx *det_ctx, const struct DetectEngineAppInspectionEngine_ *engine,
const Signature *s, const SigMatchData *smd, const Signature *s, Flow *f, uint8_t flags, void *alstate, void *txv, uint64_t tx_id)
Flow *f, uint8_t flags, void *alstate,
void *txv, uint64_t tx_id)
{ {
return DetectEngineInspectGenericList(tv, de_ctx, det_ctx, s, smd, return DetectEngineInspectGenericList(
f, flags, alstate, txv, tx_id); NULL, de_ctx, det_ctx, s, engine->smd, f, flags, alstate, txv, tx_id);
} }
static inline int static inline int

Write Preview
Loading…
Cancel
Save