sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

git:master: Makefile.groups: group for cnxcc module
by Daniel-Constantin Mierla 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 0cafc4197dc96b45c1ac712907b5c119f2ecab60 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0cafc41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 3 14:50:57 2014 +0100 Makefile.groups: group for cnxcc module - it depends now on redis and event library --- Makefile.groups | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index f2e6033..9501ca3 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -16,7 +16,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ textopsx tm tmx topoh xlog rtpengine stun sipt # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control cnxcc dmq domainpolicy msrp pdb \ +mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpc-s nosip @@ -169,6 +169,9 @@ mod_list_kazoo=kazoo # - modules depending on mongodb mod_list_mongodb=db_mongodb ndb_mongodb +# - modules depending on redis and event library +mod_list_cnxcc=cnxcc + # - all modules mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ @@ -193,7 +196,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_sctp) $(mod_list_autheph) \ $(mod_list_gzcompress) $(mod_list_uuid) \ $(mod_list_ev) $(mod_list_kazoo) \ - $(mod_list_mongodb)) + $(mod_list_mongodb) $(mod_list_cnxcc)) @@ -366,6 +369,9 @@ module_group_kkazoo=$(mod_list_kazoo) # pkg mongodb modules module_group_kmongodb=$(mod_list_mongodb) +# pkg cnxcc module +module_group_kcnxcc=$(mod_list_cnxcc) + # list of static modules # static_modules:=

1 0

Dialog profiles and circular doubly-linked lists
by Alex Hermann 03 Nov '14

03 Nov '14

Hi all, If i understood correctly, the dialog profiles are stored in a circular doubly-linked list. I haven't seen why though. So if both doubly-linked and circular aren't necessary, could the storage be reduced to a single linked list with a NULL at the end? -- Greetings, Alex Hermann

2 1

git:master: dialog: fix crash when trying to RPC export a "remote" profile
by Alex Hermann 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 79695ed2628db60199647baf653ce5f9b9005fe9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79695ed… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 23 17:49:44 2014 +0200 dialog: fix crash when trying to RPC export a "remote" profile --- modules/dialog/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index b1000b0..8cc0d5e 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1660,7 +1660,7 @@ static void internal_rpc_profile_print_dlgs(rpc_t *rpc, void *c, str *profile_na ph = profile->entries[i].first; if(ph) { do { - if (!value || (STR_EQ(*value, ph->value))) { + if ((!value || (STR_EQ(*value, ph->value))) && ph->dlg) { /* print dialog */ internal_rpc_print_dlg(rpc, c, ph->dlg, 0); }

1 0

git:master: dialog: break loop when profile entry doesn't exist
by Alex Hermann 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: a65a212c1e7587182f113a94f3d0d8b46c97baa0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a65a212… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 23 17:46:26 2014 +0200 dialog: break loop when profile entry doesn't exist --- modules/dialog/dlg_profile.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index 01f3c25..7e26e9c 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -375,33 +375,33 @@ int remove_profile(dlg_profile_table_t *profile, str *value, str *puid) unsigned int hash; struct dlg_profile_entry *p_entry; struct dlg_profile_hash *lh; - struct dlg_profile_hash *kh; hash = calc_hash_profile(value, puid, profile); lock_get(&profile->lock ); p_entry = &profile->entries[hash]; lh = p_entry->first; - while(lh) { - kh = lh->next; - if(lh->dlg==NULL && lh->puid_len==puid->len - && lh->value.len==value->len - && strncmp(lh->puid, puid->s, puid->len)==0 - && strncmp(lh->value.s, value->s, value->len)==0) { - /* last element on the list? */ - if (lh==lh->next) { - p_entry->first = NULL; - } else { - if (p_entry->first==lh) - p_entry->first = lh->next; - lh->next->prev = lh->prev; - lh->prev->next = lh->next; + if(lh) { + do { + if(lh->dlg==NULL && lh->puid_len==puid->len + && lh->value.len==value->len + && strncmp(lh->puid, puid->s, puid->len)==0 + && strncmp(lh->value.s, value->s, value->len)==0) { + /* last element on the list? */ + if (lh==lh->next) { + p_entry->first = NULL; + } else { + if (p_entry->first==lh) + p_entry->first = lh->next; + lh->next->prev = lh->prev; + lh->prev->next = lh->next; + } + lh->next = lh->prev = NULL; + if(lh->linker) shm_free(lh->linker); + p_entry->content--; + return 1; } - lh->next = lh->prev = NULL; - if(lh->linker) shm_free(lh->linker); - p_entry->content--; - return 1; - } - lh = kh; + lh = lh->next; + } while(lh != p_entry->first); } lock_release(&profile->lock ); return 0;

1 0

git:master: dialog: release lock when profile has been found
by Alex Hermann 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 10a655b5545f5170f339a9f18d702f4e85dd5778 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10a655b… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 23 17:46:00 2014 +0200 dialog: release lock when profile has been found --- modules/dialog/dlg_profile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/dialog/dlg_profile.c b/modules/dialog/dlg_profile.c index b355ad5..01f3c25 100644 --- a/modules/dialog/dlg_profile.c +++ b/modules/dialog/dlg_profile.c @@ -353,6 +353,7 @@ void remove_expired_remote_profiles(time_t te) lh->next = lh->prev = NULL; if(lh->linker) shm_free(lh->linker); p_entry->content--; + lock_release(&profile->lock); return; } lh = kh;

1 0

git:master: dmq: Don't try to use a (worker)queue before it is initialized
by Alex Hermann 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 63bbaabba4eaf14c427896bd1e0467466616f3f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=63bbaab… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Oct 24 15:13:10 2014 +0200 dmq: Don't try to use a (worker)queue before it is initialized It seems SIP traffic is handled before all children are initialized... --- modules/dmq/worker.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c index d92c7fd..1ac77f0 100644 --- a/modules/dmq/worker.c +++ b/modules/dmq/worker.c @@ -154,6 +154,10 @@ int add_dmq_job(struct sip_msg* msg, dmq_peer_t* peer) LM_ERR("error in add_dmq_job: no workers spawned\n"); goto error; } + if (!workers[0].queue) { + LM_ERR("workers not (yet) initialized\n"); + goto error; + } /* initialize the worker with the first one */ worker = workers; /* search for an available worker, or, if not possible,

1 0

git:master: pipelimit: update the limit of pipe for pl_check(pipeid, alg, limit)
by Daniel-Constantin Mierla 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 280f947eac5c66bfa6151c75983ffa9e533dd709 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=280f947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 30 22:29:01 2014 +0100 pipelimit: update the limit of pipe for pl_check(pipeid, alg, limit) - affects the dynamic pipes that could have been created by same function on a previous execution, allowing to be on-the-fly updated - reported by Alex Balashov --- modules/pipelimit/pipelimit.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/pipelimit/pipelimit.c b/modules/pipelimit/pipelimit.c index 3e6b918..a060df7 100644 --- a/modules/pipelimit/pipelimit.c +++ b/modules/pipelimit/pipelimit.c @@ -625,9 +625,9 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, if(msg==NULL) return -1; - if(fixup_get_ivalue(msg, (gparam_t*)p3limit, &limit)!=0 || limit<=0) + if(fixup_get_ivalue(msg, (gparam_t*)p3limit, &limit)!=0 || limit<0) { - LM_ERR("invalid limit value\n"); + LM_ERR("invalid limit value: %d\n", limit); return -1; } @@ -645,7 +645,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, return -1; } - pipe = pl_pipe_get(&pipeid, 0); + pipe = pl_pipe_get(&pipeid, 1); if(pipe==NULL) { LM_DBG("pipe not found [%.*s] - trying to add it\n", @@ -663,6 +663,9 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, pipeid.len, pipeid.s); return -2; } + } else { + if(limit>0) pipe->limit = limit; + pl_pipe_release(&pipe->name); } return pl_check(msg, &pipeid);

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014