1 files changed, 9 insertions, 13 deletions
diff --git a/src/libdcache/dcache_node_new.c b/src/libdcache/dcache_node_new.c
index 1d13eaf..01e2278 100644
--- a/src/libdcache/dcache_node_new.c
+++ b/src/libdcache/dcache_node_new.c
@@ -6,28 +6,24 @@
 #include <skalibs/uint16.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/gensetdyn.h>
-#include <skalibs/avltree.h>
 
 #include <shibari/dcache.h>
 #include "dcache-internal.h"
 
-dcache_node *dcache_node_new (dcache *z, char const *key, uint16_t keylen)
+int dcache_node_new (dcache *z, uint32_t *idx, char const *q, uint16_t qlen, uint16_t qtype, uint16_t extra)
 {
-  static tai const tai_infinite = TAI_INFINITE ;
   dcache_node *node ;
   uint32_t i ;
-  if (!gensetdyn_new(&z->storage, i)) return 0 ;
+  if (!gensetdyn_new(&z->storage, &i)) return 0 ;
   node = DNODE(z, i) ;
-  if (!stralloc_ready(&node->sa, 6 + keylen)) goto err0 ;
-  uint16_pack_big(node->sa.s, keylen) ;
-  memcpy(node->sa.s + 2, key, keylen) ;
-  node->sa.len = 2 + keylen ;
-  node->entry = tai_infinite ;
-  node->expire = tai_infinite ;
-  return node ;
+  if (!stralloc_ready_tuned(&node->sa, 4 + qlen + extra, 0, 0, 1)) goto err0 ;
+  uint16_pack_big(node->sa.s, qtype) ;
+  uint16_pack_big(node->sa.s + 2, qlen) ;
+  memcpy(node->sa.s + 4, q, qlen) ;
+  node->sa.len = 4 + qlen ;
+  *idx = i ;
+  return 1 ;
 
- err1:
-  node->sa.len = 0 ;
  err0:
   gensetdyn_delete(&z->storage, i) ;
   return 0 ;