Re: [SR-Users] No memory left in send_subscribe (PUA) from update_pua while building the tm dlg_t structure

Hi Daniel, I tried the patch, it works partially. There are stil memory leak. Based on your patch, I did find different places need the same kind of patch both in send_subscribe,c and in pua,c Please find the modified version of these files. Following are the differences: # diff -u send_subscribe.c.orig send_subscribe.c --- send_subscribe.c.orig 2011-12-27 13:31:06.000000000 +0100 +++ send_subscribe.c 2011-12-27 13:31:51.000000000 +0100 @@ -1151,7 +1151,6 @@ if (dbmode!=PUA_DB_ONLY) lock_release(&HashT->p_records[hash_code].lock); ret= -1; - pkg_free(td); goto done; } if (dbmode!=PUA_DB_ONLY) # diff -u pua.c.orig pua.c --- pua.c.orig 2011-12-27 13:15:47.000000000 +0100 +++ pua.c 2011-12-27 13:26:33.000000000 +0100 @@ -673,106 +673,145 @@ int update_pua(ua_pres_t* p) { - str* str_hdr= NULL; - int expires; - int result; - uac_req_t uac_r; - - if(p->desired_expires== 0) - expires= 3600; - else - expires= p->desired_expires- (int)time(NULL); + str* str_hdr= NULL; + ua_pres_t* cb_param = NULL; - if(p->watcher_uri== NULL) - { - str met= {"PUBLISH", 7}; - ua_pres_t* cb_param; - - str_hdr = publ_build_hdr(expires, get_event(p->event), NULL, - &p->etag, p->extra_headers, 0); - if(str_hdr == NULL) - { - LM_ERR("while building extra_headers\n"); - goto error; - } - LM_DBG("str_hdr:\n%.*s\n ", str_hdr->len, str_hdr->s); - - cb_param= build_uppubl_cbparam(p); - if(cb_param== NULL) - { - LM_ERR("while constructing publ callback param\n"); - goto error; - } - - set_uac_req(&uac_r, &met, str_hdr, 0, 0, TMCB_LOCAL_COMPLETED, - publ_cback_func, (void*)cb_param); - - result= tmb.t_request(&uac_r, - p->pres_uri, /* Request-URI */ - p->pres_uri, /* To */ - p->pres_uri, /* From */ - &outbound_proxy /* Outbound proxy*/ - ); - if(result< 0) - { - LM_ERR("in t_request function\n"); - shm_free(cb_param); - goto error; - } - - } - else - { - str met= {"SUBSCRIBE", 9}; - dlg_t* td= NULL; - ua_pres_t* cb_param= NULL; - - td= pua_build_dlg_t(p); - if(td== NULL) - { - LM_ERR("while building tm dlg_t structure"); - goto error; - }; - - str_hdr= subs_build_hdr(&p->contact, expires,p->event,p->extra_headers); - if(str_hdr== NULL || str_hdr->s== NULL) - { - LM_ERR("while building extra headers\n"); - pkg_free(td); - return -1; - } - cb_param= subs_cbparam_indlg(p, expires, REQ_ME); - if(cb_param== NULL) - { - LM_ERR("while constructing subs callback param\n"); - goto error; - - } - - set_uac_req(&uac_r, &met, str_hdr, 0, td, TMCB_LOCAL_COMPLETED, - subs_cback_func, (void*)cb_param); - - result= tmb.t_request_within(&uac_r); - if(result< 0) - { - LM_ERR("in t_request function\n"); - shm_free(cb_param); - pkg_free(td); - goto error; - } - - pkg_free(td); - td= NULL; - } - - pkg_free(str_hdr); - return 0; - -error: - if(str_hdr) - pkg_free(str_hdr); - return -1; + int expires; + int result = 0; + uac_req_t uac_r; + str met = {NULL, 0}; + int ret_code = 0; + dlg_t* td = NULL; + + + if(p->desired_expires== 0) + expires= default_expires; + else + expires= p->desired_expires- (int)time(NULL); + + if(p->watcher_uri== NULL) + { + + str_hdr = publ_build_hdr(expires, get_event(p->event), NULL, + &p->etag, p->extra_headers, 0); + + if(str_hdr == NULL) + { + LM_ERR("while building extra_headers\n"); + ret_code = -1; + goto done; + } + LM_DBG("str_hdr:\n%.*s\n ", str_hdr->len, str_hdr->s); + + cb_param= build_uppubl_cbparam(p); + if(cb_param== NULL) + { + LM_ERR("while constructing publ callback param\n"); + ret_code = -1; + goto done; + } + + met.s = (char*)pkg_malloc(8*sizeof(char)); + if(met.s == NULL) { + LM_ERR("no memory for met.s(PUBLISH)\n"); + ret_code = -1; + goto done; + } + memset(met.s, 0, 8); + memcpy(met.s, "PUBLISH", 7); + met.len = 7; + set_uac_req(&uac_r, &met, str_hdr, 0, 0, TMCB_LOCAL_COMPLETED, + publ_cback_func, (void*)cb_param); + + result= tmb.t_request(&uac_r, + p->pres_uri, /* Request-URI */ + p->pres_uri, /* To */ + p->pres_uri, /* From */ + &outbound_proxy /* Outbound proxy*/ + ); + if(result< 0) + { + LM_ERR("in t_request function\n"); + shm_free(cb_param); + cb_param = NULL; + ret_code = -1; + goto done; + } + } + else + { + td= pua_build_dlg_t(p); + if(td== NULL) + { + LM_ERR("while building tm dlg_t structure"); + ret_code = -1; + goto done; + }; + + str_hdr= subs_build_hdr(&p->contact, expires,p->event,p->extra_headers); + if(str_hdr== NULL || str_hdr->s== NULL) + { + if(p->event!=0) + LM_ERR("while building extra headers\n"); + + ret_code = -1; + goto done; + } + + cb_param= subs_cbparam_indlg(p, expires, REQ_ME); + if(cb_param== NULL) + { + LM_ERR("while constructing subs callback param\n"); + ret_code = -1; + goto done; + } + + met.s = (char*)pkg_malloc(10*sizeof(char)); + if(met.s == NULL) { + LM_ERR("no memory for met.s(SUBSCRIBE)\n"); + ret_code = -1; + goto done; + } + memset(met.s, 0, 10); + memcpy(met.s, "SUBSCRIBE", 9); + met.len = 9; + set_uac_req(&uac_r, &met, str_hdr, 0, td, TMCB_LOCAL_COMPLETED, + subs_cback_func, (void*)cb_param); + + result= tmb.t_request_within(&uac_r); + if(result< 0) + { + LM_ERR("in t_request function\n"); + ret_code = -1; + shm_free(cb_param); + cb_param = NULL; + goto done; + } + } + + +done: + if(td!=NULL) + { + if(td->route_set) + free_rr(&td->route_set); + + pkg_free(td); + td= NULL; + } + + if(met.s != NULL) { + pkg_free(met.s); + met.s = NULL; + met.len = 0; + } + + if(str_hdr != NULL) { + pkg_free(str_hdr); + str_hdr = NULL; + } + return ret_code; } static void db_update(unsigned int ticks,void *param) It seems a lot of change, but there are only a few lines changed, probably in the file I modify I have convert the TAB to Space and the diff does not recognize them. Another thing is I use dynamic memory for the str SUBSCRIBE and PUBLISH. Another thing for the management of NOTIFY arrives before the 202/200 OK of SUBSCRIBE, in addition to the patches done previously, maybe the hash.c need to patch for the is_dialog function which is called for the NOTIFY in PUA_XMPP module: # diff -u hash.c.orig hash.c --- hash.c.orig 2011-12-27 13:38:06.000000000 +0100 +++ hash.c 2011-12-27 13:38:38.000000000 +0100 @@ -487,10 +487,11 @@ hash_code= core_hash(dialog->pres_uri, dialog->watcher_uri, HASH_SIZE); lock_get(&HashT->p_records[hash_code].lock); - if(get_dialog(dialog, hash_code)== NULL) - ret_code= -1; - else + if(get_dialog(dialog, hash_code) || get_temporary_dialog(dialog, hash_code)) ret_code= 0; + else + ret_code= -1; + lock_release(&HashT->p_records[hash_code].lock); return ret_code; Best Regards, Laura On Fri, Dec 23, 2011 at 5:10 PM, laura testi &lt;lau.testi(a)gmail.com&gt; wrote: