sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
174 discussions

git:master: usrloc(k): set ruid for contacts added via MI command
by Daniel-Constantin Mierla 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 1984f288bcc74a0287513ce69490a38cfe16971f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1984f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 4 16:35:04 2012 +0200 usrloc(k): set ruid for contacts added via MI command --- modules_k/usrloc/Makefile | 1 + modules_k/usrloc/ul_mi.c | 10 +++++++++- modules_k/usrloc/ul_mod.c | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/Makefile b/modules_k/usrloc/Makefile index 1c6c64e..50f9ce0 100644 --- a/modules_k/usrloc/Makefile +++ b/modules_k/usrloc/Makefile @@ -16,4 +16,5 @@ SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore +SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index 1855706..ca7c71a 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -35,6 +35,7 @@ #include <string.h> #include <stdio.h> #include "../../lib/kmi/mi.h" +#include "../../lib/srutils/sruid.h" #include "../../dprint.h" #include "../../ut.h" #include "../../qvalue.h" @@ -49,12 +50,14 @@ /*! CSEQ nr used */ #define MI_UL_CSEQ 1 /*! call-id used for ul_add and ul_rm_contact */ -static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)openser.mi"); +static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)kamailio.mi"); /*! user agent used for ul_add */ static str mi_ul_ua = str_init("SIP Router MI Server"); /*! path used for ul_add and ul_rm_contact */ static str mi_ul_path = str_init("dummypath"); +extern sruid_t _ul_sruid; + /************************ helper functions ****************************/ /*! @@ -540,6 +543,10 @@ struct mi_root* mi_usrloc_add(struct mi_root *cmd, void *param) if (str2int( &node->value, (unsigned int*)&ci.methods) < 0) goto bad_syntax; + if(sruid_next(&_ul_sruid)<0) + goto error; + ci.ruid = _ul_sruid.uid; + lock_udomain( dom, aor); n = get_urecord( dom, aor, &r); @@ -580,6 +587,7 @@ release_error: release_urecord(r); lock_error: unlock_udomain( dom, aor); +error: return init_mi_tree( 500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); } diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 5a05a3d..ccd94e8 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -60,6 +60,7 @@ #include "../../timer_proc.h" /* register_sync_timer */ #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ +#include "../../lib/srutils/sruid.h" #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ #include "urecord.h" /* {insert,delete,get}_ucontact */ @@ -107,6 +108,9 @@ extern int ul_locks_no; int ul_db_update_as_insert = 0; int ul_timer_procs = 0; +/* sruid to get internal uid for mi/rpc commands */ +sruid_t _ul_sruid; + /* * Module parameters and their default values */ @@ -241,6 +245,9 @@ static int mod_init(void) int i; udomain_t* d; + if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) + return -1; + #ifdef STATISTICS /* register statistics */ if (register_module_stats( exports.name, mod_stats)!=0 ) {

1 0

git:master: kamctl: avoid including .ctlbase many times
by Daniel-Constantin Mierla 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 65247ededd6776d96cafab9ddd934136171feaf7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65247ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 4 16:13:06 2012 +0200 kamctl: avoid including .ctlbase many times - resulted in duplicated help output - added shortcuts for uptime and stats - aliased mi to fifo command --- utils/kamctl/kamctl | 12 +++++++++++- utils/kamctl/kamctl.ctlbase | 26 ++++++++++++++++++++++++++ utils/kamctl/kamctl.fifo | 5 +++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 7fe1c81..5e0d7a7 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2405,7 +2405,7 @@ case $1 in trusted "$@" ;; - fifo|unixsock|ser_mi|sercmd_mi|sercmdmi) + fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi) require_ctlengine shift $CTLCMD "$@" @@ -2469,6 +2469,16 @@ case $1 in $CTLCMD ps ;; + uptime) + require_ctlengine + $CTLCMD uptime + ;; + + stats) + require_ctlengine + $CTLCMD get_statistics all + ;; + restart) openser_stop sleep 2 diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase index 9042ec2..1148cbb 100644 --- a/utils/kamctl/kamctl.ctlbase +++ b/utils/kamctl/kamctl.ctlbase @@ -5,6 +5,10 @@ # #=================================================================== +[ "${IMPCTLBASE}" = "yes" ] && return + +export IMPCTLBASE="yes" + ##### ----------------------------------------------- ##### ### common variables and functions for CTL engines # @@ -72,3 +76,25 @@ EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_usrloc" +usage_ctlcommon() { + echo + mecho " -- command 'ps' - print details about running processes" + echo +cat <<EOF + ps ................................. details about running processes +EOF + echo + mecho " -- command 'uptime' - print uptime details" + echo +cat <<EOF + uptime ............................. print start time end elapsed seconds +EOF + echo + mecho " -- command 'stats' - print internal statistics" + echo +cat <<EOF + stats .............................. dump all internall statistics +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ctlcommon" + diff --git a/utils/kamctl/kamctl.fifo b/utils/kamctl/kamctl.fifo index 59812db..4c734cd 100644 --- a/utils/kamctl/kamctl.fifo +++ b/utils/kamctl/kamctl.fifo @@ -33,10 +33,11 @@ fi # usage_fifo() { echo - mecho " -- command 'fifo'" + mecho " -- command 'mi' - send raw MI commands" echo cat <<EOF - fifo ............................... send raw FIFO command + mi ................................. send raw MI command + fifo ............................... send raw FIFO (MI) command EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_fifo"

1 0

git:master: dialog(k): remove second useless search of dlg by callid
by Daniel-Constantin Mierla 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 8a5226f5ffb8508abdffbf342ff4b36ec321d39f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a5226f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 4 13:58:04 2012 +0200 dialog(k): remove second useless search of dlg by callid - a second search was performed using to-tag as part of the hashing function, but it was never used to build the hash id --- modules_k/dialog/dlg_hash.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index e4d4f7c..9010139 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -674,11 +674,12 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, struct dlg_cell* get_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) { struct dlg_cell *dlg; + unsigned int he; - if ((dlg = internal_get_dlg(core_hash(callid, 0, - d_table->size), callid, ftag, ttag, dir)) == 0 && - (dlg = internal_get_dlg(core_hash(callid, ttag->len - ?ttag:0, d_table->size), callid, ftag, ttag, dir)) == 0) { + he = core_hash(callid, 0, d_table->size); + dlg = internal_get_dlg(he, callid, ftag, ttag, dir); + + if (dlg == 0) { LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

1 0

git:3.2: modules_k/dialog Fixed 2 macros for dialog state with same value
by Anca Vamanu 04 May '12

04 May '12

Module: sip-router Branch: 3.2 Commit: d22d83bfca84f4e50169859eafb23f6b89a91350 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d22d83b… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri May 4 11:45:05 2012 +0300 modules_k/dialog Fixed 2 macros for dialog state with same value --- modules_k/dialog/dlg_cb.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 8d364ba..2af9bc2 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -76,7 +76,7 @@ typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, #define DLGCB_RPC_CONTEXT (1<<12) #define DLGCB_DESTROY (1<<13) #define DLGCB_SPIRALED (1<<14) -#define DLGCB_TERMINATED_CONFIRMED (1<<14) +#define DLGCB_TERMINATED_CONFIRMED (1<<15) struct dlg_callback { int types;

2 1

new columns in active_watchers/rls_watchers/silo
by Daniel-Constantin Mierla 04 May '12

04 May '12

Hello, looking at changes in the database structure from 3.2 to 3.3, I noticed the columns in active_watchers/rls_watches that have no default value and cannot be NULL. The usual issue with this kind of upgrades is that existing rows have to be removed. active_watchers is with temporary records, and I guess that is the same with rls_watchers. No persistent data is to be lost, right? Another one is extra_hdrs in silo table. I think it should be allowed to be NULL or default '' (empty string), so stored messages will not be lost - the check over the code showed inserting '' if no extra headers are present at message storage time. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

3 3

git:master: modules_k/presence Removed unused refresh_watcher() function
by Anca Vamanu 04 May '12

04 May '12

Module: sip-router Branch: master Commit: cf079a2ee0d4e234fb30822a076cba2451409e91 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf079a2… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri May 4 12:17:56 2012 +0300 modules_k/presence Removed unused refresh_watcher() function --- modules_k/presence/subscribe.c | 82 ---------------------------------------- modules_k/presence/subscribe.h | 5 -- 2 files changed, 0 insertions(+), 87 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index ae9e442..8ea65f5 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -2220,88 +2220,6 @@ error: } -int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, - int status, str* reason) -{ - unsigned int hash_code; - subs_t* s, *s_copy; - pres_ev_t* ev; - struct sip_uri uri; - str user, domain; - subs_t *s_array = NULL; - /* refresh status in subs_htable and send notify */ - - ev= contains_event(event, NULL); - if(ev== NULL) - { - LM_ERR("while searching event in list\n"); - return -1; - } - - if(parse_uri(watcher_uri->s, watcher_uri->len, &uri)< 0) - { - LM_ERR("parsing uri\n"); - return -1; - } - user= uri.user; - domain= uri.host; - - hash_code= core_hash(pres_uri, event, shtable_size); - - lock_get(&subs_htable[hash_code].lock); - - s= subs_htable[hash_code].entries->next; - - while(s) - { - if(s->event== ev && s->pres_uri.len== pres_uri->len && - strncmp(s->pres_uri.s, pres_uri->s, pres_uri->len)== 0 && - s->watcher_user.len==user.len && strncmp(s->watcher_user.s,user.s, user.len)==0 && - s->watcher_domain.len== domain.len && - strncmp(s->watcher_domain.s, domain.s, domain.len)== 0) - { - s->status= status; - if(reason) - s->reason= *reason; - - s_copy= mem_copy_subs(s, PKG_MEM_TYPE); - if(s_copy== NULL) - { - LM_ERR("copying subs_t\n"); - lock_release(&subs_htable[hash_code].lock); - goto error; - } - - s_copy->local_cseq++; - s_copy->next= s_array; - s_array= s_copy; - } - s= s->next; - } - lock_release(&subs_htable[hash_code].lock); - - s = s_array; - while (s) { - if(notify(s, NULL, NULL, 0)< 0) { - LM_ERR("Failed to send Notify\n"); - } - s_copy = s; - s = s->next; - pkg_free(s_copy); - } - - return 0; - -error: - s = s_array; - while (s) { - s_copy = s; - s = s->next; - pkg_free(s_copy); - } - return -1; -} - int get_db_subs_auth(subs_t* subs, int* found) { db_key_t db_keys[5]; diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index 57b49c4..821df0f 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -102,11 +102,6 @@ void timer_db_update(unsigned int ticks,void *param); int update_subs_db(subs_t* subs, int type); -int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, - int status, str* reason); - -typedef int (*refresh_watcher_t)(str*, str* , str* ,int , str* ); - int restore_db_subs(void); typedef int (*handle_expired_func_t)(subs_t* );

1 0

git:master: modules_k/presence Fixed refresh_watcher function
by Anca Vamanu 04 May '12

04 May '12

Module: sip-router Branch: master Commit: ca7f45d98faea9479b86e9206c4e2923a009782a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ca7f45d… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri May 4 11:57:27 2012 +0300 modules_k/presence Fixed refresh_watcher function --- modules_k/presence/subscribe.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index add1581..ae9e442 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -2225,9 +2225,10 @@ int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, { unsigned int hash_code; subs_t* s, *s_copy; - pres_ev_t* ev; + pres_ev_t* ev; struct sip_uri uri; str user, domain; + subs_t *s_array = NULL; /* refresh status in subs_htable and send notify */ ev= contains_event(event, NULL); @@ -2262,28 +2263,43 @@ int refresh_watcher(str* pres_uri, str* watcher_uri, str* event, s->status= status; if(reason) s->reason= *reason; - + s_copy= mem_copy_subs(s, PKG_MEM_TYPE); if(s_copy== NULL) { LM_ERR("copying subs_t\n"); lock_release(&subs_htable[hash_code].lock); - return -1; + goto error; } - lock_release(&subs_htable[hash_code].lock); + s_copy->local_cseq++; - if(notify(s_copy, NULL, NULL, 0)< 0) - { - LM_ERR("in notify function\n"); - pkg_free(s_copy); - return -1; - } - pkg_free(s_copy); - lock_get(&subs_htable[hash_code].lock); + s_copy->next= s_array; + s_array= s_copy; } s= s->next; } + lock_release(&subs_htable[hash_code].lock); + + s = s_array; + while (s) { + if(notify(s, NULL, NULL, 0)< 0) { + LM_ERR("Failed to send Notify\n"); + } + s_copy = s; + s = s->next; + pkg_free(s_copy); + } + return 0; + +error: + s = s_array; + while (s) { + s_copy = s; + s = s->next; + pkg_free(s_copy); + } + return -1; } int get_db_subs_auth(subs_t* subs, int* found)

2 2

git:master: modules_k/ dialog Fixed 2 macros for dialog state with same value
by Anca Vamanu 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 03ddbac19eefc239c3d4b91377458a2e8106855b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03ddbac… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri May 4 11:45:05 2012 +0300 modules_k/dialog Fixed 2 macros for dialog state with same value --- modules_k/dialog/dlg_cb.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 8d364ba..2af9bc2 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -76,7 +76,7 @@ typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg, #define DLGCB_RPC_CONTEXT (1<<12) #define DLGCB_DESTROY (1<<13) #define DLGCB_SPIRALED (1<<14) -#define DLGCB_TERMINATED_CONFIRMED (1<<14) +#define DLGCB_TERMINATED_CONFIRMED (1<<15) struct dlg_callback { int types;

1 0

runtime pv evaluation
by Jasmin Schnatterbeck 03 May '12

03 May '12

Hello, currently I am looking for an option to evaluate a string with pseudo-variables at script runtime. For example when reading the following string (in script) from database "from is $fu and to-uri-user is $(tu{uri.user}) and cl is $cl" into a pseudo-variable $var(tmp) I want kamailio to parse the _content_ of $var(tmp): replace the "inside"-pvs with their values and perform transformations. Is there a function exported to script, that could do that? (Background: I would like to make the lcr-module a bit more flexible: read "template"-string for fromuri, touri, ruri from database instead of ruri-strip, ruri-prefix etc.) Kind Regards Jasmin

2 2

git:master: msilo(k): avoid potential pkg_malloc(0) if no extra hdrs are available
by Daniel-Constantin Mierla 03 May '12

03 May '12

Module: sip-router Branch: master Commit: 27a338bb2d0b3665054c1b5bbc6a2832b15e0206 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27a338b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 3 12:15:49 2012 +0200 msilo(k): avoid potential pkg_malloc(0) if no extra hdrs are available --- modules_k/msilo/msilo.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index 2680af4..209b309 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1112,17 +1112,22 @@ static int m_dump(struct sip_msg* msg, str* owner_s) } tmp_extra_hdrs.len = extra_hdrs_str.len+str_vals[4].len; - if ((tmp_extra_hdrs.s = pkg_malloc(tmp_extra_hdrs.len)) == NULL) + if(tmp_extra_hdrs.len>0) { - LM_ERR("Out of pkg memory"); - if (msilo_dbf.free_result(db_con, db_res) < 0) - LM_ERR("failed to free the query result\n"); - msg_list_set_flag(ml, mid, MS_MSG_ERRO); - goto error; + if ((tmp_extra_hdrs.s = pkg_malloc(tmp_extra_hdrs.len)) == NULL) + { + LM_ERR("Out of pkg memory"); + if (msilo_dbf.free_result(db_con, db_res) < 0) + LM_ERR("failed to free the query result\n"); + msg_list_set_flag(ml, mid, MS_MSG_ERRO); + goto error; + } + memcpy(tmp_extra_hdrs.s, extra_hdrs_str.s, extra_hdrs_str.len); + memcpy(tmp_extra_hdrs.s+extra_hdrs_str.len, str_vals[4].s, str_vals[4].len); + } else { + tmp_extra_hdrs.len = 0; + tmp_extra_hdrs.s = ""; } - memcpy(tmp_extra_hdrs.s, extra_hdrs_str.s, extra_hdrs_str.len); - memcpy(tmp_extra_hdrs.s+extra_hdrs_str.len, str_vals[4].s, str_vals[4].len); - hdr_str.len = 1024; if(m_build_headers(&hdr_str, str_vals[3] /*ctype*/, str_vals[0]/*from*/, rtime /*Date*/,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012