From: Jason Ish Date: Fri, 15 Jul 2016 14:14:03 +0000 (-0600) Subject: flow-vars: remove flow locks X-Git-Tag: suricata-3.2beta1~348 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1de7e6dae450923eef68e23e61596eae3e6a795;p=thirdparty%2Fsuricata.git flow-vars: remove flow locks Code is now entered under flow lock. --- diff --git a/src/flow-var.c b/src/flow-var.c index 5262b5a795..96b3ad3a84 100644 --- a/src/flow-var.c +++ b/src/flow-var.c @@ -88,9 +88,7 @@ void FlowVarAddStrNoLock(Flow *f, uint16_t idx, uint8_t *value, uint16_t size) /* add a flowvar to the flow, or update it */ void FlowVarAddStr(Flow *f, uint16_t idx, uint8_t *value, uint16_t size) { - FLOWLOCK_WRLOCK(f); FlowVarAddStrNoLock(f, idx, value, size); - FLOWLOCK_UNLOCK(f); } /* add a flowvar to the flow, or update it */ @@ -117,9 +115,7 @@ void FlowVarAddIntNoLock(Flow *f, uint16_t idx, uint32_t value) /* add a flowvar to the flow, or update it */ void FlowVarAddInt(Flow *f, uint16_t idx, uint32_t value) { - FLOWLOCK_WRLOCK(f); FlowVarAddIntNoLock(f, idx, value); - FLOWLOCK_UNLOCK(f); } void FlowVarFree(FlowVar *fv)