Changeset 629

Timestamp:

15/07/08 12:30:30 (4 months ago)

Author:

smoku

Message:

Removed jid prep cache and mysql filters cache.
These are known to grow without restrictions causing memory "leak". Patches by Mark Doliner. Refs #219

Location:

trunk

Files:

• c2s/authreg.c (modified) (2 diffs)
• c2s/c2s.c (modified) (2 diffs)
• c2s/c2s.h (modified) (1 diff)
• c2s/main.c (modified) (4 diffs)
• router/main.c (modified) (2 diffs)
• router/router.c (modified) (4 diffs)
• router/router.h (modified) (1 diff)
• s2s/in.c (modified) (6 diffs)
• s2s/main.c (modified) (2 diffs)
• s2s/out.c (modified) (4 diffs)
• s2s/router.c (modified) (1 diff)
• s2s/s2s.h (modified) (1 diff)
• sm/aci.c (modified) (1 diff)
• sm/main.c (modified) (2 diffs)
• sm/mod_announce.c (modified) (1 diff)
• sm/mod_disco.c (modified) (1 diff)
• sm/mod_disco_publish.c (modified) (2 diffs)
• sm/mod_echo.c (modified) (1 diff)
• sm/mod_help.c (modified) (1 diff)
• sm/mod_presence.c (modified) (1 diff)
• sm/mod_privacy.c (modified) (4 diffs)
• sm/mod_roster.c (modified) (3 diffs)
• sm/mod_roster_publish.c (modified) (2 diffs)
• sm/mod_session.c (modified) (3 diffs)
• sm/mod_status.c (modified) (1 diff)
• sm/mod_template_roster.c (modified) (1 diff)
• sm/pkt.c (modified) (9 diffs)
• sm/sm.h (modified) (1 diff)
• storage/storage_mysql.c (modified) (6 diffs)
• util/jid.c (modified) (8 diffs)
• util/jid.h (modified) (3 diffs)

trunk/c2s/authreg.c

@@ -333 +333 @@
 
         /* the full user jid for this session */
-        sess->resources->jid = jid_new(c2s->pc, sess->s->req_to, -1);
+        sess->resources->jid = jid_new(sess->s->req_to, -1);
         jid_reset_components(sess->resources->jid, username, sess->resources->jid->domain, resource);
 
@@ -594 +594 @@
 
     /* the user jid for this transaction */
-    sess->resources->jid = jid_new(c2s->pc, sess->s->req_to, -1);
+    sess->resources->jid = jid_new(sess->s->req_to, -1);
     jid_reset_components(sess->resources->jid, username, sess->resources->jid->domain, sess->resources->jid->resource);
 

trunk/c2s/c2s.c

@@ -238 +238 @@
             if((ns = nad_find_scoped_namespace(nad, uri_BIND, NULL)) >= 0 && (elem = nad_find_elem(nad, 0, ns, "bind", 1)) >= 0 && nad_find_attr(nad, 0, -1, "type", "set") >= 0) {
                 bres_t bres;
-                jid_t jid = jid_new(sess->c2s->pc, sess->s->auth_id, -1);
+                jid_t jid = jid_new(sess->s->auth_id, -1);
 
                 /* get the resource */
@@ -984 +984 @@
 
                 /* build temporary resource to close session for */
-                jid = jid_new(sess->c2s->pc, sess->s->auth_id, -1);
+                jid = jid_new(sess->s->auth_id, -1);
                 tres = (bres_t) calloc(1, sizeof(struct bres_st));
                 tres->jid = jid;

trunk/c2s/c2s.h

@@ -237 +237 @@
     int                 stanza_size_limit;
 
-    /** stringprep cache */
-    prep_cache_t        pc;
-
     /** access controls */
     access_t            access;

trunk/c2s/main.c

@@ -404 +404 @@
 
             /* authzid must be a valid jid */
-            jid.pc = c2s->pc;
             if(jid_reset(&jid, creds->authzid, -1) == NULL)
                 return sx_sasl_ret_FAIL;
@@ -430 +429 @@
         case sx_sasl_cb_GEN_AUTHZID:
             /* generate a jid for SASL ANONYMOUS */
-            jid.pc = c2s->pc;
             jid_reset(&jid, s->req_to, -1);
 
@@ -636 +634 @@
         }
 
-    c2s->pc = prep_cache_new();
-
     c2s->sessions = xhash_new(1023);
 
@@ -827 +823 @@
     xhash_free(c2s->sessions);
 
-    prep_cache_free(c2s->pc);
-
     authreg_free(c2s->ar);
 

trunk/router/main.c

@@ -382 +382 @@
     r->conn_rates = xhash_new(101);
 
-    r->pc = prep_cache_new();
-
     r->components = xhash_new(101);
     r->routes = xhash_new(101);
@@ -508 +506 @@
     sx_env_free(r->sx_env);
 
-    prep_cache_free(r->pc);
-
     mio_free(r->mio);
 

trunk/router/router.c

@@ -144 +144 @@
 
     attr = nad_find_attr(nad, 0, -1, "name", NULL);
-    if(attr < 0 || (name = jid_new(comp->r->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (name = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "no or invalid 'name' on bind packet, bouncing");
         nad_set_attr(nad, 0, -1, "error", "400", 3);
@@ -267 +267 @@
 
     attr = nad_find_attr(nad, 0, -1, "name", NULL);
-    if(attr < 0 || (name = jid_new(comp->r->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (name = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "no or invalid 'name' on unbind packet, bouncing");
         nad_set_attr(nad, 0, -1, "error", "400", 3);
@@ -365 +365 @@
     afrom = nad_find_attr(nad, 0, -1, "from", NULL);
 
-    sto.pc = sfrom.pc = comp->r->pc;
     if(ato >= 0) to = jid_reset(&sto, NAD_AVAL(nad, ato), NAD_AVAL_L(nad, ato));
     if(afrom >= 0) from = jid_reset(&sfrom, NAD_AVAL(nad, afrom), NAD_AVAL_L(nad, afrom));
@@ -714 +713 @@
                 log_debug(ZONE, "packet from legacy component, munging it");
 
-                sto.pc = sfrom.pc = comp->r->pc;
-
                 attr = nad_find_attr(nad, 0, -1, "to", NULL);
                 if(attr < 0 || (to = jid_reset(&sto, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {

trunk/router/router.h

@@ -125 +125 @@
 
     time_t              next_check;
-                       
-    /** stringprep cache */
-    prep_cache_t        pc;
-    
+
     /** attached components, key is 'ip:port', var is component_t */
     xht                 components;

trunk/s2s/in.c

@@ -335 +335 @@
 
     attr = nad_find_attr(nad, 0, -1, "from", NULL);
-    if(attr < 0 || (from = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid from on db result packet");
         nad_free(nad);
@@ -342 +342 @@
 
     attr = nad_find_attr(nad, 0, -1, "to", NULL);
-    if(attr < 0 || (to = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid to on db result packet");
         jid_free(from);
@@ -429 +429 @@
     
     attr = nad_find_attr(nad, 0, -1, "from", NULL);
-    if(attr < 0 || (from = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid from on db verify packet");
         nad_free(nad);
@@ -436 +436 @@
 
     attr = nad_find_attr(nad, 0, -1, "to", NULL);
-    if(attr < 0 || (to = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid to on db verify packet");
         jid_free(from);
@@ -504 +504 @@
     
     attr = nad_find_attr(nad, 0, -1, "from", NULL);
-    if(attr < 0 || (from = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid from on incoming packet");
         nad_free(nad);
@@ -511 +511 @@
 
     attr = nad_find_attr(nad, 0, -1, "to", NULL);
-    if(attr < 0 || (to = jid_new(in->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid to on incoming packet");
         jid_free(from);

trunk/s2s/main.c

@@ -677 +677 @@
     s2s->dns_bad = xhash_new(401);
 
-    s2s->pc = prep_cache_new();
-
     s2s->dead = jqueue_new();
     s2s->dead_conn = jqueue_new();
@@ -926 +924 @@
     xhash_free(s2s->hosts);
 
-    prep_cache_free(s2s->pc);
-
     jqueue_free(s2s->dead);
     jqueue_free(s2s->dead_conn);

trunk/s2s/out.c

@@ -1490 +1490 @@
 
     attr = nad_find_attr(nad, 0, -1, "from", NULL);
-    if(attr < 0 || (from = jid_new(out->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid from on db result packet");
         nad_free(nad);
@@ -1497 +1497 @@
 
     attr = nad_find_attr(nad, 0, -1, "to", NULL);
-    if(attr < 0 || (to = jid_new(out->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid to on db result packet");
         jid_free(from);
@@ -1559 +1559 @@
     
     attr = nad_find_attr(nad, 0, -1, "from", NULL);
-    if(attr < 0 || (from = jid_new(out->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid from on db verify packet");
         nad_free(nad);
@@ -1566 +1566 @@
 
     attr = nad_find_attr(nad, 0, -1, "to", NULL);
-    if(attr < 0 || (to = jid_new(out->s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
+    if(attr < 0 || (to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr))) == NULL) {
         log_debug(ZONE, "missing or invalid to on db verify packet");
         jid_free(from);

trunk/s2s/router.c

@@ -255 +255 @@
 
             attr = nad_find_attr(nad, 0, -1, "from", NULL);
-            pkt->from = jid_new(s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
+            pkt->from = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
 
             attr = nad_find_attr(nad, 0, -1, "to", NULL);
-            pkt->to = jid_new(s2s->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
+            pkt->to = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
 
             /* change the packet so it looks like it came to us, so the router won't reject it if we bounce it later */

trunk/s2s/s2s.h

@@ -158 +158 @@
     time_t              next_expiry;
 
-    /** stringprep cache */
-    prep_cache_t        pc;
-
     /** list of sx_t on the way out */
     jqueue_t            dead;

trunk/sm/aci.c

@@ -62 +62 @@
             if(NAD_CDATA_L(sm->config->nad, jelem) > 0)
             {
-                jid = jid_new(sm->pc, NAD_CDATA(sm->config->nad, jelem), NAD_CDATA_L(sm->config->nad, jelem));
+                jid = jid_new(NAD_CDATA(sm->config->nad, jelem), NAD_CDATA_L(sm->config->nad, jelem));
                 list = jid_append(list, jid);
                 

trunk/sm/main.c

@@ -263 +263 @@
     sm_signature(sm, PACKAGE " sm " VERSION);
 
-    sm->pc = prep_cache_new();
-
     /* start storage */
     sm->st = storage_new(sm);
@@ -400 +398 @@
     sx_env_free(sm->sx_env);
 
-    prep_cache_free(sm->pc);
-
     log_free(sm->log);
 

trunk/sm/mod_announce.c

@@ -330 +330 @@
     data->index = mod->index;
 
-    jid = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+    jid = jid_new(mod->mm->sm->id, -1);
     data->announcejid = jid_reset_components(jid, jid->node, jid->domain, "announce");
-    jid = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+    jid = jid_new(mod->mm->sm->id, -1);
     data->onlinejid = jid_reset_components(jid, jid->node, jid->domain, "announce/online");
 

trunk/sm/mod_disco.c

@@ -705 +705 @@
         svc->features = xhash_new(13);
 
-        svc->jid = jid_new(mod->mm->sm->pc, NAD_AVAL(nad, jid), NAD_AVAL_L(nad, jid));
+        svc->jid = jid_new(NAD_AVAL(nad, jid), NAD_AVAL_L(nad, jid));
 
         /* link it in */

trunk/sm/mod_disco_publish.c

@@ -100 +100 @@
 
         /* jid */
-        di->jid = jid_new(mod->mm->sm->pc, NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+        di->jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
 
         /* name */
@@ -275 +275 @@
                 di = (disco_item_t) calloc(1, sizeof(struct disco_item_st));
 
-                di->jid = jid_new(mod->mm->sm->pc, str, -1);
+                di->jid = jid_new(str, -1);
 
                 if(os_object_get_str(os, o, "name", &str))

trunk/sm/mod_echo.c

@@ -63 +63 @@
 
     /* store sm/echo jid for use when answering probes */
-    jid = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+    jid = jid_new(mod->mm->sm->id, -1);
     mod->private = jid_reset_components(jid, jid->node, jid->domain, "echo");
 

trunk/sm/mod_help.c

@@ -161 +161 @@
 
     /* store sm/help jid for use when answering probes */
-    hlpjid = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+    hlpjid = jid_new(mod->mm->sm->id, -1);
     mod->private = jid_reset_components(hlpjid, hlpjid->node, hlpjid->domain, "help");
 

trunk/sm/mod_presence.c

@@ -184 +184 @@
 
     /* store sm jid for use when answering probes */
-    mod->private = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+    mod->private = jid_new(mod->mm->sm->id, -1);
 
     mod->in_sess = _presence_in_sess;

trunk/sm/mod_privacy.c

@@ -205 +205 @@
 
                         case zebra_JID:
-                            zitem->jid = jid_new(user->sm->pc, str, strlen(str));
+                            zitem->jid = jid_new(str, strlen(str));
                             if(zitem->jid == NULL) {
                                 log_debug(ZONE, "invalid jid '%s' on item, dropping this item", str);
@@ -757 +757 @@
                     return -stanza_err_BAD_REQUEST;
 
-                jidt = jid_new(sess->user->sm->pc, NAD_AVAL(pkt->nad, jid), NAD_AVAL_L(pkt->nad, jid));
+                jidt = jid_new(NAD_AVAL(pkt->nad, jid), NAD_AVAL_L(pkt->nad, jid));
                 if(jidt == NULL)
                     return -stanza_err_BAD_REQUEST;
@@ -787 +787 @@
                         zitem->type = zebra_JID;
 
-                        zitem->jid = jid_new(sess->user->sm->pc, NAD_AVAL(pkt->nad, jid), NAD_AVAL_L(pkt->nad, jid));
+                        zitem->jid = jid_new(NAD_AVAL(pkt->nad, jid), NAD_AVAL_L(pkt->nad, jid));
                         pool_cleanup(zlist->p, (void *) jid_free, zitem->jid);
                         zitem->deny = 1;
@@ -977 +977 @@
                         zitem->type = zebra_JID;
 
-                        zitem->jid = jid_new(mod->mm->sm->pc, NAD_AVAL(pkt->nad, value), NAD_AVAL_L(pkt->nad, value));
+                        zitem->jid = jid_new(NAD_AVAL(pkt->nad, value), NAD_AVAL_L(pkt->nad, value));
                         if(zitem->jid == NULL) {
                             log_debug(ZONE, "invalid jid '%.*s', failing request", NAD_AVAL_L(pkt->nad, value), NAD_AVAL(pkt->nad, value));

trunk/sm/mod_roster.c

@@ -183 +183 @@
         jid_free(pkt->from);
 
-    pkt->from = jid_new(mod->mm->sm->pc, jid_user(sess->jid), -1);
+    pkt->from = jid_new(jid_user(sess->jid), -1);
     nad_set_attr(pkt->nad, 1, -1, "from", jid_full(pkt->from), 0);
 
@@ -281 +281 @@
     /* extract the jid */
     attr = nad_find_attr(pkt->nad, elem, -1, "jid", NULL);
-    jid = jid_new(pkt->sm->pc, NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+    jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
     if(jid == NULL) {
         log_debug(ZONE, "jid failed prep check, skipping");
@@ -676 +676 @@
                     item = (item_t) calloc(1, sizeof(struct item_st));
 
-                    item->jid = jid_new(mi->mod->mm->sm->pc, str, -1);
+                    item->jid = jid_new(str, -1);
                     if(item->jid == NULL) {
                         log_debug(ZONE, "eek! invalid jid %s, skipping it", str);

trunk/sm/mod_roster_publish.c

@@ -234 +234 @@
                         checksm=0;
                         if( jid ) jid_free(jid);
-                        jid = jid_new(user->sm->pc, str, -1);
+                        jid = jid_new(str, -1);
                         if( roster_publish->removedomain ) {
                             if( strcmp(jid->domain,roster_publish->removedomain) == 0 ) {
@@ -307 +307 @@
                             item = (item_t) calloc(1, sizeof(struct item_st));
 
-                            item->jid = jid_new(mi->mod->mm->sm->pc, jid_user(jid), -1);
+                            item->jid = jid_new(jid_user(jid), -1);
                             if(item->jid == NULL) {
                                 log_debug(ZONE, "eek! invalid jid %s, skipping it", jid_user(jid));

trunk/sm/mod_session.c

@@ -87 +87 @@
         /* session start */
         if(pkt->type == pkt_SESS) {
-            jid = jid_new(sm->pc, NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+            jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
 
             if(jid != NULL)
@@ -127 +127 @@
         /* user create */
         if(pkt->type == pkt_SESS_CREATE) {
-            jid = jid_new(sm->pc, NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+            jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
 
             if(jid == NULL || user_create(sm, jid) != 0) {
@@ -154 +154 @@
         /* user delete */
         if(pkt->type == pkt_SESS_DELETE) {
-            jid = jid_new(sm->pc, NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
+            jid = jid_new(NAD_AVAL(pkt->nad, attr), NAD_AVAL_L(pkt->nad, attr));
             if(jid == NULL) {
                 pkt_free(pkt);

trunk/sm/mod_status.c

@@ -238 +238 @@
     tr->resource = config_get_one(mod->mm->sm->config, "status.resource", 0);
     if(tr->resource) {
-        tr->jid = jid_new(mod->mm->sm->pc, mod->mm->sm->id, -1);
+        tr->jid = jid_new(mod->mm->sm->id, -1);
         tr->jid = jid_reset_components(tr->jid, tr->jid->node, tr->jid->domain, tr->resource);
     }

trunk/sm/mod_template_roster.c

@@ -114 +114 @@
         item = (item_t) pmalloco(xhash_pool(tr->items), sizeof(struct item_st));
 
-        item->jid = jid_new(tr->sm->pc, NAD_AVAL(nad, ajid), NAD_AVAL_L(nad, ajid));
+        item->jid = jid_new(NAD_AVAL(nad, ajid), NAD_AVAL_L(nad, ajid));
         if(item->jid == NULL) {
             log_write(tr->sm->log, LOG_ERR, "roster template has item with invalid jid, skipping");

trunk/sm/pkt.c

@@ -84 +84 @@
     /* set replacement attrs */
     if(to != NULL) {
-        pnew->to = jid_new(pkt->sm->pc, to, -1);
+        pnew->to = jid_new(to, -1);
         nad_set_attr(pnew->nad, 1, -1, "to", jid_full(pnew->to), 0);
     } else if(pkt->to != NULL)
@@ -90 +90 @@
 
     if(from != NULL) {
-        pnew->from = jid_new(pkt->sm->pc, from, -1);
+        pnew->from = jid_new(from, -1);
         nad_set_attr(pnew->nad, 1, -1, "from", jid_full(pnew->from), 0);
     } else if(pkt->from != NULL)
@@ -124 +124 @@
         /* route element */
         if((attr = nad_find_attr(nad, 0, -1, "to", NULL)) >= 0)
-            pkt->rto = jid_new(sm->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
+            pkt->rto = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
         if((attr = nad_find_attr(nad, 0, -1, "from", NULL)) >= 0)
-            pkt->rfrom = jid_new(sm->pc, NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
+            pkt->rfrom = jid_new(NAD_AVAL(nad, attr), NAD_AVAL_L(nad, attr));
 
         /* route type */