durable_rules 0.34.48 → 0.34.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d84abbe4090ab34d7cdc91409cf4d8051afce1
-  data.tar.gz: 196e6c8eb885f12d46a32deaaf6d6d0161e6ec44
+  metadata.gz: 22182a3f342a7baddc4202f0a48cd221657b54db
+  data.tar.gz: 154047fd34c12c8c2203273d984d0f746a0d546e
 SHA512:
-  metadata.gz: 109df08236d6b157e1f631ea502960ae5205ecdeef2a7bb55769978bbd7b62f1b4988e5154b602f6a2ac125c2927956bf39e3bce48add692549d4fc58b7a6e5c
-  data.tar.gz: 8971e18c1d4b4a479e29712db7fa3fec15de5df1c511aa7bf705fcf6da0e10d1a5ecf9b0a705b15cd92bdb8501b31b66888702ba68980a82278ea3902cfa5f98
+  metadata.gz: 642cf6196149419c42a710d2509a366d2843dac644e2ca55b3590a2335dce2557ece809b9015c77372e420a40eeb1e0deaec0c5f0d60ff9710653116d66eb0bd
+  data.tar.gz: 6fdc663a2161aff98a5e7d432cde22b1128e1c1f075dde20107bf487698a74b219fee761f739ec20596602442b34ce967686e6da63efe4ec5af3dc237eee1b25

data/src/rules/state.c

@@ -56,6 +56,57 @@ static unsigned int evictEntry(ruleset *tree) {
     return result;
 }
 
+static void deleteEntry(ruleset *tree, char *sid, unsigned int sidHash) {
+    unsigned int bucket = sidHash % tree->stateBucketsLength;
+    unsigned int offset = tree->stateBuckets[bucket];
+    unsigned int lastOffset = UNDEFINED_HASH_OFFSET;
+    unsigned char found = 0;
+    while (!found && offset != UNDEFINED_HASH_OFFSET) {
+        stateEntry *current = &tree->state[offset];
+        if (current->sidHash == sidHash) {
+            if (!strcmp(current->sid, sid)) {
+                if (lastOffset == UNDEFINED_HASH_OFFSET) {
+                    tree->stateBuckets[bucket] = current->nextHashOffset;
+                } else {
+                    tree->state[lastOffset].nextHashOffset = current->nextHashOffset;
+                }
+
+                if (current->state) {
+                    free(current->state);
+                    current->state = NULL;
+                }
+
+                free(current->sid);
+                current->sid = NULL;
+                current->sidHash = 0;
+                current->bindingIndex = 0;
+                current->lastRefresh = 0;
+                current->jo.propertiesLength = 0;
+                found = 1;
+
+
+                // remove entry from lru double linked list
+                if (current->prevLruOffset != UNDEFINED_HASH_OFFSET) {
+                    tree->state[current->prevLruOffset].nextLruOffset = current->nextLruOffset;
+                    if (tree->mruStateOffset == offset) {
+                        tree->mruStateOffset = current->prevLruOffset;
+                    }
+                }
+
+                if (current->nextLruOffset != UNDEFINED_HASH_OFFSET) {
+                    tree->state[current->nextLruOffset].prevLruOffset = current->prevLruOffset;
+                    if (tree->lruStateOffset == offset) {
+                        tree->lruStateOffset = current->nextLruOffset;
+                    }
+                }
+            }
+        }
+
+        lastOffset = offset;
+        offset = current->nextHashOffset;
+    }
+}
+
 static unsigned int addEntry(ruleset *tree, char *sid, unsigned int sidHash) {
     unsigned newOffset;
     if (tree->stateLength == tree->maxStateLength) {
@@ -628,5 +679,11 @@ unsigned int deleteState(unsigned int handle, char *sid) {
     }
 
     unsigned int sidHash = fnv1Hash32(sid, strlen(sid));
-    return deleteSession(tree, rulesBinding, sid, sidHash);
+    result = deleteSession(tree, rulesBinding, sid, sidHash);
+    if (result != RULES_OK) {
+      return result;
+    }
+
+    deleteEntry(tree, sid, sidHash);
+    return RULES_OK;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.48
+  version: 0.34.49
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake