Ticket #168: jabberd2_limit_nadcache.diff

util/nad.c

@@ -117 +117 @@
 nad_cache_t nad_cache_new(void)
 {
     nad_cache_t cache;
-    cache = malloc(sizeof(nad_cache_t));
-    *cache = NULL;
+    cache = malloc(sizeof(struct nad_cache_st));
+    cache->len = 0;
+    cache->nads = malloc(sizeof(struct nad_st **));
+    *cache->nads = NULL;
 
 #ifdef NAD_DEBUG
     if(_nad_alloc_tracked == NULL) _nad_alloc_tracked = xhash_new(501);
@@ -133 +135 @@
 void nad_cache_free(nad_cache_t cache)
 {
     nad_t cur;
-    while((cur = *cache) != NULL)
+    while((cur = *cache->nads) != NULL)
     {
-        *cache = cur->next;
+        *cache->nads = cur->next;
         free(cur->elems);
         free(cur->attrs);
         free(cur->nss);
@@ -143 +145 @@
         free(cur->depths);
         free(cur);
     }
+    free(cache->nads);
     free(cache);
 }
 
@@ -154 +157 @@
 #ifndef NAD_DEBUG
     /* If cache==NULL, then this NAD is not in a cache */
 
-    if ((cache!=NULL) && (*cache != NULL))
+    if ((cache!=NULL) && (*cache->nads != NULL))
     {
-        nad = *cache;
-        *cache = nad->next;
+        nad = *cache->nads;
+        *cache->nads = nad->next;
+        cache->len--;
         nad->ccur = nad->ecur = nad->acur = nad->ncur = 0;
         nad->scope = -1;
         nad->cache = cache;
@@ -232 +236 @@
     xhash_put(_nad_free_tracked, pstrdup(xhash_pool(_nad_free_tracked), loc), (void *) nad);
     }
 #else
-    /* If nad->cache != NULL, then put back into cache, otherwise this nad is not in a cache */
-
-    if (nad->cache != NULL) {
-       nad->next = *(nad->cache);
-       *(nad->cache) = nad;
+    /* If nad->cache != NULL, there are less than 100 nads in the
+     * cache and this nad isn't gigantic then put back into cache,
+     * otherwise we should just free this nad */
+    if (nad->cache != NULL && nad->cache->len < 100 && nad->elen < 100000 && nad->alen < 100000 && nad->clen < 100000 && nad->dlen < 100000) {
+       nad->next = *(nad->cache->nads);
+       *(nad->cache->nads) = nad;
+       nad->cache->len++;
        return;
     } 
 #endif

util/nad.h

@@ -49 +49 @@
 # include <config.h>
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+
 /* jabberd2 Windows DLL */
 #ifndef JABBERD2_API
 # ifdef _WIN32
@@ -62 +66 @@
 # endif /* _WIN32 */
 #endif /* JABBERD2_API */
 
-typedef struct nad_st **nad_cache_t;
+typedef struct nad_cache_st *nad_cache_t;
 
 struct nad_elem_st {
     int parent;
@@ -102 +106 @@
     struct nad_st *next; /* for keeping a list of nads */
 } *nad_t;
 
+struct nad_cache_st
+{
+    struct nad_st **nads;
+    size_t len;
+};
+
 /** create a new cache, simple pointer to a list of nads */
 JABBERD2_API nad_cache_t nad_cache_new(void);