sr-dev January 2014

sr-dev@lists.kamailio.org

27 participants
210 discussions

git:master: modules/ims_usrloc_scscf: New features to fully support subscription to reg_event

by Richard Good

Module: sip-router Branch: master Commit: 73ad320cc6ddc2df267cc05b3856eed1698c0e3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73ad320… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Jan 31 09:36:57 2014 +0200 modules/ims_usrloc_scscf: New features to fully support subscription to reg_event Main change add API to presence module library to store the callid/totag/fromtag presentity combination Also only remove IMPU from usrloc if there are no subscriptions to it --- modules/ims_usrloc_scscf/impurecord.c | 46 +++++++++------ modules/ims_usrloc_scscf/impurecord.h | 2 +- modules/ims_usrloc_scscf/subscribe.c | 103 +++++++++++++++++++++++++++++++-- modules/ims_usrloc_scscf/subscribe.h | 9 +++- modules/ims_usrloc_scscf/udomain.c | 20 +++++-- modules/ims_usrloc_scscf/ul_mod.c | 65 ++++++++++++++++++++- modules/ims_usrloc_scscf/ul_mod.h | 11 ++++ modules/ims_usrloc_scscf/usrloc.c | 2 + modules/ims_usrloc_scscf/usrloc.h | 10 +++- 9 files changed, 233 insertions(+), 35 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=73a…

10 years, 10 months

git:master: pkg/centos: added snmpstats MIB files to spec file

by Luis Martin Gil

Module: sip-router Branch: master Commit: 52c05835058a0813df1bf2291669bfe539f52a71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52c0583… Author: Luis Martin Gil <martingil.luis(a)gmail.com> Committer: Luis Martin Gil <martingil.luis(a)gmail.com> Date: Fri Jan 31 02:46:17 2014 +0000 pkg/centos: added snmpstats MIB files to spec file - Some files were missing from the snmpstats module when packing into rpm. Adding them to the rpm spec file --- pkg/kamailio/centos/6/kamailio.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 8cdd254..a4470ee 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1047,6 +1047,11 @@ fi %defattr(-,root,root) %{_docdir}/kamailio/modules/README.snmpstats %{_libdir}/kamailio/modules/snmpstats.so +%{_datadir}/snmp/mibs/KAMAILIO-MIB +%{_datadir}/snmp/mibs/KAMAILIO-REG-MIB +%{_datadir}/snmp/mibs/KAMAILIO-SIP-COMMON-MIB +%{_datadir}/snmp/mibs/KAMAILIO-SIP-SERVER-MIB +%{_datadir}/snmp/mibs/KAMAILIO-TC %files sqlite

10 years, 10 months

git:master: mqueue: Add new psuedo-variable to return mqueue size

by Hugh Waite

Module: sip-router Branch: master Commit: 40ea6ffd76cf32aafc594038d17555edbc816b50 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=40ea6ff… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Thu Jan 30 21:58:43 2014 +0000 mqueue: Add new psuedo-variable to return mqueue size - Using PV will return a value when the length is zero --- modules/mqueue/README | 78 +++++++++++++++++++++-------------- modules/mqueue/doc/mqueue_admin.xml | 30 +++++++++++--- modules/mqueue/mqueue_api.c | 25 +++++++++++ modules/mqueue/mqueue_api.h | 2 + modules/mqueue/mqueue_mod.c | 2 + 5 files changed, 100 insertions(+), 37 deletions(-) diff --git a/modules/mqueue/README b/modules/mqueue/README index 8d41f8a..b58607c 100644 --- a/modules/mqueue/README +++ b/modules/mqueue/README @@ -1,3 +1,4 @@ + mqueue Module Elena-Ramona Modroiu @@ -18,7 +19,7 @@ Alex Balashov <abalashov(a)evaristesys.com> Copyright � 2010 Elena-Ramona Modroiu (asipto.com) - __________________________________________________________________ + _________________________________________________________________ Table of Contents @@ -36,10 +37,12 @@ Alex Balashov 4. Functions - 4.1. mq_add(queue, key, value) - 4.2. mq_fetch(queue) - 4.3. mq_pv_free(queue) - 4.4. mq_size(queue) + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) + 4.4. mq_size(queue) + + 5. Exported Pseudo-variables List of Examples @@ -65,20 +68,22 @@ Chapter 1. Admin Guide 4. Functions - 4.1. mq_add(queue, key, value) - 4.2. mq_fetch(queue) - 4.3. mq_pv_free(queue) - 4.4. mq_size(queue) + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) + 4.4. mq_size(queue) + + 5. Exported Pseudo-variables 1. Overview - The mqueue module offers a generic message queue system in shared - memory for inter-process communication using the config file. One - example of usage is to send time consuming operations to one or several - timer processes that consumes items in the queue, without affecting SIP - message handling in the socket-listening process. + The mqueue module offers a generic message queue system in shared + memory for inter-process communication using the config file. One + example of usage is to send time consuming operations to one or + several timer processes that consumes items in the queue, without + affecting SIP message handling in the socket-listening process. - There can be many defined queues. Access to queued values is done via + There can be many defined queues. Access to queued values is done via pseudo variables. 2. Dependencies @@ -93,7 +98,7 @@ Chapter 1. Admin Guide 2.2. External Libraries or Applications - The following libraries or applications must be installed before + The following libraries or applications must be installed before running Kamailio with this module loaded: * None. @@ -105,15 +110,15 @@ Chapter 1. Admin Guide Definition of a memory queue - Default value is "none". + Default value is "none". - Value must be a list of parameters: attr=value;... The attribute 'name' - is mandatory, defining the name of the queue. Optional attribute 'size' - specifies the maximum number of items in queue, if it is execeeded the - oldest one is removed. + Value must be a list of parameters: attr=value;... The attribute + 'name' is mandatory, defining the name of the queue. Optional + attribute 'size' specifies the maximum number of items in queue, if it + is execeeded the oldest one is removed. - The parameter can be set many times, each holding the definition of one - queue. + The parameter can be set many times, each holding the definition of + one queue. Example 1.1. Set mqueue parameter ... @@ -123,14 +128,14 @@ modparam("mqueue", "mqueue", "name=qaz") 4. Functions - 4.1. mq_add(queue, key, value) - 4.2. mq_fetch(queue) - 4.3. mq_pv_free(queue) - 4.4. mq_size(queue) + 4.1. mq_add(queue, key, value) + 4.2. mq_fetch(queue) + 4.3. mq_pv_free(queue) + 4.4. mq_size(queue) 4.1. mq_add(queue, key, value) - Add a new item (key, value) in the queue. If max size of queue is + Add a new item (key, value) in the queue. If max size of queue is exceeded, the oldest one is removed. Example 1.2. mq_add usage @@ -140,10 +145,10 @@ mq_add("myq", "$rU", "call from $fU"); 4.2. mq_fetch(queue) - Take oldest item from queue and fill $mqk(queue) and $mqv(queue) pseudo - variables. + Take oldest item from queue and fill $mqk(queue) and $mqv(queue) + pseudo variables. - Return: true on success (1); false on failure (-1) or no item fetched + Return: true on success (1); false on failure (-1) or no item fetched (-2). Example 1.3. mq_fetch usage @@ -173,3 +178,14 @@ mq_pv_free("myq"); $var(q_size) = mq_size("queue"); xlog("L_INFO", "Size of queue is: $var(q_size)\n"); ... + +5. Exported Pseudo-variables + + * $mqv(mqueue) - the most recent item key fetched from the specified + mqueue + * $mqv(mqueue) - the most recent item value fetched from the + specified mqueue + * $mq_size(mqueue) - the size of the specified mqueue + + Exported pseudo-variables are documented at + http://www.kamailio.org/wiki/. diff --git a/modules/mqueue/doc/mqueue_admin.xml b/modules/mqueue/doc/mqueue_admin.xml index a444cc4..1aee029 100644 --- a/modules/mqueue/doc/mqueue_admin.xml +++ b/modules/mqueue/doc/mqueue_admin.xml @@ -61,7 +61,7 @@ <section> <title>Parameters</title> - <section> + <section id="mqueue.p.mqueue"> <title><varname>mqueue</varname> (string)</title> <para> Definition of a memory queue @@ -96,7 +96,7 @@ modparam("mqueue", "mqueue", "name=qaz") <section> <title>Functions</title> - <section> + <section id="mqueue.f.mq_add"> <title> <function moreinfo="none">mq_add(queue, key, value)</function> </title> @@ -114,7 +114,7 @@ mq_add("myq", "$rU", "call from $fU"); </example> </section> - <section> + <section id="mqueue.f.mq_fetch"> <title> <function moreinfo="none">mq_fetch(queue)</function> </title> @@ -139,7 +139,7 @@ while(mq_fetch("myq")) </example> </section> - <section> + <section id="mqueue.f.mq_pv_free"> <title> <function moreinfo="none">mq_pv_free(queue)</function> </title> @@ -157,7 +157,7 @@ mq_pv_free("myq"); </example> </section> - <section> + <section id="mqueue.f.mq_size"> <title> <function moreinfo="none">mq_size(queue)</function> </title> @@ -176,6 +176,24 @@ xlog("L_INFO", "Size of queue is: $var(q_size)\n"); </section> </section> - + + <section> + <title>Exported Pseudo-variables</title> + <itemizedlist> + <listitem> + <emphasis>$mqv(mqueue)</emphasis> - the most recent item key fetched from the specified mqueue + </listitem> + <listitem> + <emphasis>$mqv(mqueue)</emphasis> - the most recent item value fetched from the specified mqueue + </listitem> + <listitem> + <emphasis>$mq_size(mqueue)</emphasis> - the size of the specified mqueue + </listitem> + </itemizedlist> + <para> + Exported pseudo-variables are documented at &kamwikilink;. + </para> + </section> + </chapter> diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index 4a36909..e060991 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -456,6 +456,31 @@ int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &mp->item->val); } +/** + * + */ +int pv_get_mq_size(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + int mqs = -1; + str *in = pv_get_mq_name(msg, &param->pvn.u.isname.name.s); + + if (in == NULL) + { + LM_ERR("failed to get mq name\n"); + return -1; + } + + mqs = _mq_get_csize(in); + + if (mqs < 0) + { + LM_ERR("mqueue not found: %.*s\n", in->len, in->s); + return -1; + } + + return pv_get_sintval(msg, param, res, mqs); +} /* Return head->csize for a given queue */ int _mq_get_csize(str *name) diff --git a/modules/mqueue/mqueue_api.h b/modules/mqueue/mqueue_api.h index cb695f1..1c69c69 100644 --- a/modules/mqueue/mqueue_api.h +++ b/modules/mqueue/mqueue_api.h @@ -33,6 +33,8 @@ int pv_get_mqk(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_mq_size(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); int mq_head_defined(void); void mq_destroy(void); diff --git a/modules/mqueue/mqueue_mod.c b/modules/mqueue/mqueue_mod.c index 3eacf02..2115630 100644 --- a/modules/mqueue/mqueue_mod.c +++ b/modules/mqueue/mqueue_mod.c @@ -59,6 +59,8 @@ static pv_export_t mod_pvs[] = { pv_parse_mq_name, 0, 0, 0 }, { {"mqv", sizeof("mqv")-1}, PVT_OTHER, pv_get_mqv, 0, pv_parse_mq_name, 0, 0, 0 }, + { {"mq_size", sizeof("mq_size")-1}, PVT_OTHER, pv_get_mq_size, 0, + pv_parse_mq_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

10 years, 10 months

git:master: dialog: fix datestop output for list* RPC commands

by Ovidiu Sas

Module: sip-router Branch: master Commit: c57e597c99db09bea2bfa9533b2553ede0572720 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c57e597… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Jan 30 14:25:02 2014 -0500 dialog: fix datestop output for list* RPC commands --- 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 9c3f839..9c824f3 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -1458,7 +1458,7 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, strftime(_start_date_buf, RPC_DATE_BUF_LEN - 1, "%Y-%m-%d %H:%M:%S", _start_t); if (dlg->tl.timeout) { - _stop_ts = (time_t)(dlg->tl.timeout); + _stop_ts = time(0) + dlg->tl.timeout - get_ticks(); _stop_t = localtime(&_stop_ts); strftime(_stop_date_buf, RPC_DATE_BUF_LEN - 1, "%Y-%m-%d %H:%M:%S", _stop_t);

10 years, 10 months

git:master: utils/db_berkeley: release file description in error cases

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e7a0840a1334280650d4abb865843da0072adec6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7a0840… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 30 12:12:44 2014 +0100 utils/db_berkeley: release file description in error cases --- utils/db_berkeley/kambdb_recover.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/utils/db_berkeley/kambdb_recover.c b/utils/db_berkeley/kambdb_recover.c index 76e6fc9..357e61f 100644 --- a/utils/db_berkeley/kambdb_recover.c +++ b/utils/db_berkeley/kambdb_recover.c @@ -332,6 +332,7 @@ int recover(char* jfn) { fprintf(stderr, "[recover]: Table %s is not supported.\n",tn); fprintf(stderr, "[recover]: FAILED to load journal file: %s.\n", jfn); + fclose(fp); return 2; } @@ -340,6 +341,7 @@ int recover(char* jfn) if(!tbc || !tp) { fprintf(stderr, "[recover]: FAILED to get find metadata for : %s.\n", tn); + fclose(fp); return 3; }

10 years, 10 months

git:master: core: test the limits of nested select level before accessing array value

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b61f173a8dc40592809912e137e42d8ffe1154fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b61f173… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 30 12:14:48 2014 +0100 core: test the limits of nested select level before accessing array value --- select.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/select.c b/select.c index 36ae814..772b371 100644 --- a/select.c +++ b/select.c @@ -432,7 +432,7 @@ int run_select(str* res, select_t* s, struct sip_msg* msg) orig_level = select_level; ret = 0; for ( select_level=0; - (ret == 0) && (s->f[select_level] !=0 ) && (select_level<MAX_NESTED_CALLS); + (ret == 0) && (select_level<MAX_NESTED_CALLS) && (s->f[select_level] !=0 ); select_level++ ) { ret = s->f[select_level](res, s, msg);

10 years, 10 months

git:master: modules/ims_usrloc_pcscf: fix segfault when running in DB mode (deleting contact)

by Jason Penton

Module: sip-router Branch: master Commit: 2977c559d89ba7e04b9b5a32336baa9789078921 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2977c55… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu Jan 30 11:33:51 2014 +0200 modules/ims_usrloc_pcscf: fix segfault when running in DB mode (deleting contact) --- modules/ims_usrloc_pcscf/udomain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 83975d6..da7af05 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -551,13 +551,14 @@ int delete_pcontact(udomain_t* _d, str* _aor, struct pcontact* _c) if (exists_ulcb_type(PCSCF_CONTACT_DELETE)) { run_ul_callbacks(PCSCF_CONTACT_DELETE, _c); } - mem_delete_pcontact(_d, _c); if (db_mode == WRITE_THROUGH && db_delete_pcontact(_c) != 0) { LM_ERR("Error deleting contact from DB"); return -1; } + mem_delete_pcontact(_d, _c); + return 0; }

10 years, 10 months

git:master: sercmd: memset with proper size

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d0ebc7fa4b4b20bee83f57b3f0d0e6e75b5f0b08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0ebc7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 29 22:10:09 2014 +0100 sercmd: memset with proper size --- utils/sercmd/sercmd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/sercmd.c b/utils/sercmd/sercmd.c index 90dfcb7..7bb435a 100644 --- a/utils/sercmd/sercmd.c +++ b/utils/sercmd/sercmd.c @@ -1649,7 +1649,7 @@ static int get_counters_list(int s) grp->var_no = 0; grp->var_names=malloc(sizeof(str)*grp->cnt_vars_no); if (grp->var_names==0) goto error_mem; - memset(grp->var_names, 0, sizeof(str)*grp->var_no); + memset(grp->var_names, 0, sizeof(str)*grp->cnt_vars_no); for (r=0; r<grp->cnt_vars_no; r++) { if (grp->cnt_vars_array[r].type!=BINRPC_T_STR) continue;

10 years, 10 months

Notice: changes to apt repositories

by Daniel-Constantin Mierla

Hello, the current server hosting the apt repositories for debian and ubuntu is scheduled for replacement. It hasn't been updated with new packages in a while. Courtesy of Sipwise, a new build system is under development and should be available in the near future. Meanwhile, we plan to clone the existing packages to another server and have them available till the new system is up and running. As all these involve operations requiring DNS change and file transfer, the repositories might be unavailable from time to time. Many thanks to Jon Bonilla that took care of building the deb packages so far and Inaki Baz Castillo for hosting the afferent repositories. Note also that all Kamailio packages for latest version are also available via the official repositories from Debian unstable (sid) - thanks to Victor Seva for the work on it. Perhaps testing will get them soon and with the next stable version, should be no longer needed to use our repositories by users of Debian. We plan to keep ours as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

10 years, 10 months

git:master: dialog: enhance list* RPC commands

by Ovidiu Sas

Module: sip-router Branch: master Commit: 33e7e899e5aa7dc291ec45a711100e6200896f14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33e7e89… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Wed Jan 29 15:39:47 2014 -0500 dialog: enhance list* RPC commands - human readable format for dialog start/stop timestamps - adding lifetime parameter --- modules/dialog/dialog.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/modules/dialog/dialog.c b/modules/dialog/dialog.c index 307b90f..9c3f839 100644 --- a/modules/dialog/dialog.c +++ b/modules/dialog/dialog.c @@ -90,6 +90,8 @@ MODULE_VERSION +#define RPC_DATE_BUF_LEN 21 + static int mod_init(void); static int child_init(int rank); static void mod_destroy(void); @@ -1445,9 +1447,28 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, int with_context) { rpc_cb_ctx_t rpc_cb; + time_t _start_ts, _stop_ts; + struct tm *_start_t, *_stop_t; + char _start_date_buf[RPC_DATE_BUF_LEN]="UNSPECIFIED"; + char _stop_date_buf[RPC_DATE_BUF_LEN]="UNSPECIFIED"; + + _start_ts = (time_t)dlg->start_ts; + if (_start_ts) { + _start_t = localtime(&_start_ts); + strftime(_start_date_buf, RPC_DATE_BUF_LEN - 1, + "%Y-%m-%d %H:%M:%S", _start_t); + if (dlg->tl.timeout) { + _stop_ts = (time_t)(dlg->tl.timeout); + _stop_t = localtime(&_stop_ts); + strftime(_stop_date_buf, RPC_DATE_BUF_LEN - 1, + "%Y-%m-%d %H:%M:%S", _stop_t); + } + } - rpc->printf(c, "hash:%u:%u state:%u ref_count:%u timestart:%u timeout:%u", - dlg->h_entry, dlg->h_id, dlg->state, dlg->ref, dlg->start_ts, dlg->tl.timeout); + rpc->printf(c, "hash:%u:%u state:%u ref_count:%u " + "timestart:%u timeout:%u lifetime:%u datestart:%s datestop:%s", + dlg->h_entry, dlg->h_id, dlg->state, dlg->ref, _start_ts, dlg->tl.timeout, dlg->lifetime, + _start_date_buf, _stop_date_buf); rpc->printf(c, "\tcallid:%.*s from_tag:%.*s to_tag:%.*s", dlg->callid.len, dlg->callid.s, dlg->tag[DLG_CALLER_LEG].len, dlg->tag[DLG_CALLER_LEG].s,

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2014