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

update runmodes to handle detect-less

Browse Source 
In runmodes setup, consider a NULL de_ctx to mean detect is disabled.
pull/796/head
Victor Julien 12 years ago
parent dfda0cd4b6
commit 0e08f4b6fc
5 changed files with 97 additions and 50 deletions
Show Stats Download Patch File Download Diff File

4
src/runmode-erf-file.c
Unescape Escape View File

@ -106,12 +106,14 @@ int RunModeErfFileSingle(DetectEngineCtx *de_ctx)
}
TmSlotSetFuncAppend(tv, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
printf("ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv, tm_module, (void *)de_ctx);
}
SetupOutputs(tv);
@ -232,12 +234,14 @@ int RunModeErfFileAutoFp(DetectEngineCtx *de_ctx)
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
printf("ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, (void *)de_ctx);
}
if (threading_set_cpu_affinity) {
TmThreadSetCPUAffinity(tv_detect_ncpu, (int)cpu);

10
src/runmode-pcap-file.c
Unescape Escape View File

@ -109,12 +109,14 @@ int RunModeFilePcapSingle(DetectEngineCtx *de_ctx)
}
TmSlotSetFuncAppend(tv, tm_module, NULL);
if (de_ctx) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv, tm_module, (void *)de_ctx);
}
SetupOutputs(tv);
@ -153,6 +155,11 @@ int RunModeFilePcapAuto(DetectEngineCtx *de_ctx)
TmModule *tm_module;
RunModeInitialize();
if (de_ctx == NULL) {
SCLogError(SC_ERR_RUNMODE, "can't mix runmode 'auto' and disabled detect");
return -1;
}
/* Available cpus */
uint16_t ncpus = UtilCpuGetNumProcessorsOnline();
@ -404,13 +411,14 @@ int RunModeFilePcapAutoFp(DetectEngineCtx *de_ctx)
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, NULL);
if (de_ctx) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, (void *)de_ctx);
}
char *thread_group_name = SCStrdup("Detect");
if (unlikely(thread_group_name == NULL)) {

2
src/runmode-tile.c
Unescape Escape View File

@ -249,12 +249,14 @@ int RunModeTileMpipeWorkers(DetectEngineCtx *de_ctx)
}
TmSlotSetFuncAppend(tv_worker, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
printf("ERROR: TmModuleGetByName Detect failed\n");
exit(EXIT_FAILURE);
}
TmSlotSetFuncAppend(tv_worker, tm_module, (void *)de_ctx);
}
tm_module = TmModuleGetByName("RespondReject");
if (tm_module == NULL) {

3
src/runmodes.c
Unescape Escape View File

@ -243,6 +243,9 @@ void RunModeListRunmodes(void)
return;
}
/**
* \param de_ctx Detection engine ctx. Can be NULL is detect is disabled.
*/
void RunModeDispatch(int runmode, const char *custom_mode, DetectEngineCtx *de_ctx)
{
char *local_custom_mode = NULL;

30
src/util-runmodes.c
Unescape Escape View File

@ -61,6 +61,11 @@ int RunModeSetLiveCaptureAuto(DetectEngineCtx *de_ctx,
char tname[TM_THREAD_NAME_MAX];
int thread;
if (de_ctx == NULL) {
SCLogError(SC_ERR_RUNMODE, "can't use runmode 'auto' when detection is disabled");
return -1;
}
if ((nlive <= 1) && (live_dev != NULL)) {
void *aconf;
SCLogDebug("live_dev %s", live_dev);
@ -317,6 +322,9 @@ char *RunmodeAutoFpCreatePickupQueuesString(int n) {
return queues;
}
/**
* \param de_ctx detection engine, can be NULL
*/
int RunModeSetLiveCaptureAutoFp(DetectEngineCtx *de_ctx,
ConfigIfaceParserFunc ConfigParser,
ConfigIfaceThreadsCountFunc ModThreadsCount,
@ -491,6 +499,7 @@ int RunModeSetLiveCaptureAutoFp(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
@ -498,6 +507,7 @@ int RunModeSetLiveCaptureAutoFp(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppendDelayed(tv_detect_ncpu, tm_module,
(void *)de_ctx, de_ctx->delayed_detect);
}
TmThreadSetCPU(tv_detect_ncpu, DETECT_CPU_SET);
@ -528,6 +538,9 @@ int RunModeSetLiveCaptureAutoFp(DetectEngineCtx *de_ctx,
return 0;
}
/**
* \param de_ctx detection engine, can be NULL
*/
static int RunModeSetLiveCaptureWorkersForDevice(DetectEngineCtx *de_ctx,
ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name,
@ -593,6 +606,7 @@ static int RunModeSetLiveCaptureWorkersForDevice(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppend(tv, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
@ -600,6 +614,7 @@ static int RunModeSetLiveCaptureWorkersForDevice(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppendDelayed(tv, tm_module,
(void *)de_ctx, de_ctx->delayed_detect);
}
tm_module = TmModuleGetByName("RespondReject");
if (tm_module == NULL) {
@ -708,6 +723,11 @@ int RunModeSetIPSAuto(DetectEngineCtx *de_ctx,
uint16_t ncpus = UtilCpuGetNumProcessorsOnline();
int nqueue = LiveGetDeviceCount();
if (de_ctx == NULL) {
SCLogError(SC_ERR_RUNMODE, "can't use runmode 'auto' when detection is disabled");
return -1;
}
for (int i = 0; i < nqueue; i++) {
/* create the threads */
cur_queue = LiveGetDeviceName(i);
@ -894,6 +914,9 @@ int RunModeSetIPSAuto(DetectEngineCtx *de_ctx,
}
/**
* \param de_ctx detection engine, can be NULL
*/
int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
ConfigIPSParserFunc ConfigParser,
char *recv_mod_name,
@ -997,6 +1020,7 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppend(tv_detect_ncpu, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
@ -1004,6 +1028,7 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppendDelayed(tv_detect_ncpu, tm_module,
(void *)de_ctx, de_ctx->delayed_detect);
}
TmThreadSetCPU(tv_detect_ncpu, DETECT_CPU_SET);
@ -1067,6 +1092,9 @@ int RunModeSetIPSAutoFp(DetectEngineCtx *de_ctx,
return 0;
}
/**
* \param de_ctx detection engine, can be NULL
*/
int RunModeSetIPSWorker(DetectEngineCtx *de_ctx,
ConfigIPSParserFunc ConfigParser,
char *recv_mod_name,
@ -1125,6 +1153,7 @@ int RunModeSetIPSWorker(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppend(tv, tm_module, NULL);
if (de_ctx != NULL) {
tm_module = TmModuleGetByName("Detect");
if (tm_module == NULL) {
SCLogError(SC_ERR_RUNMODE, "TmModuleGetByName Detect failed");
@ -1132,6 +1161,7 @@ int RunModeSetIPSWorker(DetectEngineCtx *de_ctx,
}
TmSlotSetFuncAppendDelayed(tv, tm_module,
(void *)de_ctx, de_ctx->delayed_detect);
}
tm_module = TmModuleGetByName(verdict_mod_name);
if (tm_module == NULL) {

Write Preview
Loading…
Cancel
Save