Removing FlowAllocDirect since it's not needed anymore

src/flow-hash.c

@@ -340,7 +340,7 @@ static Flow *FlowGetNew(Packet *p) {
         }
 
         /* now see if we can alloc a new flow */
-        f = FlowAllocDirect();
+        f = FlowAlloc();
         if (f == NULL) {
             return NULL;
         }

src/flow-util.c

@@ -39,46 +39,12 @@
 /* Counter of flows that reached memcap capability */
 uint32_t directflows = 0;
 
-/* Allocate a flow without checking memcap */
-Flow *FlowAllocDirect(void)
-{
-    Flow *f;
-
-    SCMutexLock(&flow_memuse_mutex);
-    /* We allow to alloc even if memcap is reached (but later we
-     * will clean up some flows */
-    f = SCMalloc(sizeof(Flow));
-    if (f == NULL) {
-        SCMutexUnlock(&flow_memuse_mutex);
-        return NULL;
-    }
-    directflows++;
-
-    flow_memuse += sizeof(Flow);
-    SCMutexUnlock(&flow_memuse_mutex);
-    //FlowPrintQueueInfo();
-
-    SCMutexInit(&f->m, NULL);
-    f->lnext = NULL;
-    f->lprev = NULL;
-    f->hnext = NULL;
-    f->hprev = NULL;
-
-    f->flowvar = NULL;
-
-    return f;
-}
-
 /* Allocate a flow */
 Flow *FlowAlloc(void)
 {
     Flow *f;
 
     SCMutexLock(&flow_memuse_mutex);
-    if (flow_memuse + sizeof(Flow) > flow_config.memcap) {
-        SCMutexUnlock(&flow_memuse_mutex);
-        return NULL;
-    }
     f = SCMalloc(sizeof(Flow));
     if (f == NULL) {
         SCMutexUnlock(&flow_memuse_mutex);

src/flow.c

@@ -792,8 +792,15 @@ void FlowInitConfig (char quiet)
 
     /* pre allocate flows */
     for (i = 0; i < flow_config.prealloc; i++) {
+        if (flow_memuse + sizeof(Flow) > flow_config.memcap) {
+            SCMutexUnlock(&flow_memuse_mutex);
+            printf("ERROR: FlowAlloc failed (max flow memcap reached): %s\n", strerror(errno));
+            exit(1);
+        }
+
         Flow *f = FlowAlloc();
         if (f == NULL) {
+            SCMutexUnlock(&flow_memuse_mutex);
             printf("ERROR: FlowAlloc failed: %s\n", strerror(errno));
             exit(1);
         }