netmap/runmode: minor code cleanup

pull/8305/head
Victor Julien 4 years ago
parent 0e5af9e8a7
commit 0ff88c0315

@ -410,29 +410,30 @@ static int NetmapRunModeInit(NetmapRunMode_t runmode)
const char *live_dev = NULL; const char *live_dev = NULL;
(void)ConfGet("netmap.live-interface", &live_dev); (void)ConfGet("netmap.live-interface", &live_dev);
const char *runmode_str = "unknown";
int ret; int ret;
switch (runmode) { switch (runmode) {
case NETMAP_AUTOFP: case NETMAP_AUTOFP:
runmode_str = "autofp";
ret = RunModeSetLiveCaptureAutoFp(ParseNetmapConfig, NetmapConfigGeThreadsCount, ret = RunModeSetLiveCaptureAutoFp(ParseNetmapConfig, NetmapConfigGeThreadsCount,
"ReceiveNetmap", "DecodeNetmap", thread_name_autofp, live_dev); "ReceiveNetmap", "DecodeNetmap", thread_name_autofp, live_dev);
break; break;
case NETMAP_WORKERS: case NETMAP_WORKERS:
runmode_str = "workers";
ret = RunModeSetLiveCaptureWorkers(ParseNetmapConfig, NetmapConfigGeThreadsCount, ret = RunModeSetLiveCaptureWorkers(ParseNetmapConfig, NetmapConfigGeThreadsCount,
"ReceiveNetmap", "DecodeNetmap", thread_name_workers, live_dev); "ReceiveNetmap", "DecodeNetmap", thread_name_workers, live_dev);
break; break;
case NETMAP_SINGLE: case NETMAP_SINGLE:
runmode_str = "single";
ret = RunModeSetLiveCaptureSingle(ParseNetmapConfig, NetmapConfigGeThreadsCount, ret = RunModeSetLiveCaptureSingle(ParseNetmapConfig, NetmapConfigGeThreadsCount,
"ReceiveNetmap", "DecodeNetmap", thread_name_single, live_dev); "ReceiveNetmap", "DecodeNetmap", thread_name_single, live_dev);
break; break;
} }
if (ret != 0) { if (ret != 0) {
FatalError("Unable to start runmode %s", runmode == NETMAP_AUTOFP ? "autofp" FatalError("Unable to start runmode %s", runmode_str);
: runmode == NETMAP_WORKERS ? "workers"
: "single");
} }
SCLogDebug("%s initialized", SCLogDebug("%s initialized", runmode_str);
runmode == NETMAP_AUTOFP ? "autofp" : runmode == NETMAP_WORKERS ? "workers" : "single");
SCReturnInt(0); SCReturnInt(0);
} }

Loading…
Cancel
Save