From 491686c33e475c7e6dd863a3b657d53cd7af07e6 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@regit.org>
Date: Wed, 14 Sep 2011 09:59:59 +0200
Subject: [PATCH] pcap: factorise single mode.

---
 src/runmode-pcap.c | 70 ++++++++--------------------------------------
 1 file changed, 12 insertions(+), 58 deletions(-)

diff --git a/src/runmode-pcap.c b/src/runmode-pcap.c
index 51490abb06..b0da4bb991 100644
--- a/src/runmode-pcap.c
+++ b/src/runmode-pcap.c
@@ -142,74 +142,28 @@ int PcapConfigGeThreadsCount(void *conf)
  */
 int RunModeIdsPcapSingle(DetectEngineCtx *de_ctx)
 {
-    int npcap = LiveGetDeviceCount();
-    char *pcap_dev = NULL;
-    char *pcap_devc = NULL;
+    int ret;
+    char *live_dev = NULL;
 
-    if (npcap > 1) {
-        SCLogError(SC_ERR_RUNMODE,
-                   "Can't use single runmode with multiple device");
-        exit(EXIT_FAILURE);
-    }
+    SCEnter();
 
     RunModeInitialize();
     TimeModeSetLive();
 
-    if (ConfGet("pcap.single_pcap_dev", &pcap_dev) == 0) {
-        SCLogError(SC_ERR_RUNMODE, "Failed retrieving "
-                "pcap.single_pcap_dev from Conf");
-        exit(EXIT_FAILURE);
-    }
-
-    SCLogDebug("pcap_dev %s", pcap_dev);
-    pcap_devc = SCStrdup(pcap_dev);
-
-    /* create the threads */
-    ThreadVars *tv = TmThreadCreatePacketHandler("PcapLive",
-                                                 "packetpool", "packetpool",
-                                                 "packetpool", "packetpool",
-                                                 "pktacqloop");
-    if (tv == NULL) {
-        printf("ERROR: TmThreadsCreate failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    TmModule *tm_module = TmModuleGetByName("ReceivePcap");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName failed for ReceivePcap\n");
-        exit(EXIT_FAILURE);
-    }
-    TmSlotSetFuncAppend(tv, tm_module, pcap_devc);
-
-    tm_module = TmModuleGetByName("DecodePcap");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName DecodePcap failed\n");
-        exit(EXIT_FAILURE);
-    }
-    TmSlotSetFuncAppend(tv, tm_module, NULL);
-
-    tm_module = TmModuleGetByName("StreamTcp");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName StreamTcp failed\n");
-        exit(EXIT_FAILURE);
-    }
-    TmSlotSetFuncAppend(tv, tm_module, NULL);
+    ConfGet("pcap.single_pcap_dev", &live_dev);
 
-    tm_module = TmModuleGetByName("Detect");
-    if (tm_module == NULL) {
-        printf("ERROR: TmModuleGetByName Detect failed\n");
+    ret = RunModeSetLiveCaptureSingle(de_ctx,
+                                    ParsePcapConfig, "ReceivePcap",
+                                    "DecodePcap", "PcapLive",
+                                    live_dev);
+    if (ret != 0) {
+        printf("ERROR: Unable to start runmode\n");
         exit(EXIT_FAILURE);
     }
-    TmSlotSetFuncAppend(tv, tm_module, (void *)de_ctx);
 
-    SetupOutputs(tv);
+    SCLogInfo("RunModeIdsPcapSingle initialised");
 
-    if (TmThreadSpawn(tv) != TM_ECODE_OK) {
-        printf("ERROR: TmThreadSpawn failed\n");
-        exit(EXIT_FAILURE);
-    }
-
-    return 0;
+    SCReturnInt(0);
 }