]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
logging: remove output priorities: not used
authorJason Ish <ish@unx.ca>
Mon, 6 Jun 2016 20:38:56 +0000 (14:38 -0600)
committerVictor Julien <victor@inliniac.net>
Mon, 19 Sep 2016 11:47:52 +0000 (13:47 +0200)
src/runmodes.c
src/tm-modules.h

index b4f319d4081a6ab52cbe9b0edb328cb1029d2ef1..2d5bc32aa09c9f0ac026a0e1da068c6e10b10e28 100644 (file)
@@ -537,30 +537,9 @@ static void AddOutputToFreeList(OutputModule *module, OutputCtx *output_ctx)
     TAILQ_INSERT_TAIL(&output_free_list, fl_output, entries);
 }
 
-
-static int GetRunModeOutputPriority(RunModeOutput *module)
-{
-    TmModule *tm = TmModuleGetByName(module->name);
-    if (tm == NULL)
-        return 0;
-
-    return tm->priority;
-}
-
 static void InsertInRunModeOutputs(RunModeOutput *runmode_output)
 {
-    RunModeOutput *r_output = NULL;
-    int output_priority = GetRunModeOutputPriority(runmode_output);
-
-    TAILQ_FOREACH(r_output, &RunModeOutputs, entries) {
-        if (GetRunModeOutputPriority(r_output) < output_priority)
-            break;
-    }
-    if (r_output) {
-        TAILQ_INSERT_BEFORE(r_output, runmode_output, entries);
-    } else {
-        TAILQ_INSERT_TAIL(&RunModeOutputs, runmode_output, entries);
-    }
+    TAILQ_INSERT_TAIL(&RunModeOutputs, runmode_output, entries);
 }
 
 /** \brief Turn output into thread module */
index e85aa76908e2b4de4b295feef43db74b43d9b9e9..4e29aa35563b1fefcd2278903c1918575e5f6a5f 100644 (file)
@@ -68,8 +68,6 @@ typedef struct TmModule_ {
                              the given TmModule */
     /* Other flags used by the module */
     uint8_t flags;
-    /* priority in the logging order, higher priority is runned first */
-    uint8_t priority;
 } TmModule;
 
 TmModule tmm_modules[TMM_SIZE];