sr-dev July 2015

sr-dev@lists.kamailio.org

26 participants
301 discussions

git:master:dc486a94: cfgutils: updated docs for sleep() and usleep()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dc486a9464de5d12d00af28675e51e843492e36a URL: https://github.com/kamailio/kamailio/commit/dc486a9464de5d12d00af28675e51e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-21T14:20:15+02:00 cfgutils: updated docs for sleep() and usleep() --- Modified: modules/cfgutils/doc/cfgutils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dc486a9464de5d12d00af28675e51e8… Patch: https://github.com/kamailio/kamailio/commit/dc486a9464de5d12d00af28675e51e8… --- diff --git a/modules/cfgutils/doc/cfgutils_admin.xml b/modules/cfgutils/doc/cfgutils_admin.xml index f62fd68..0266ab5 100644 --- a/modules/cfgutils/doc/cfgutils_admin.xml +++ b/modules/cfgutils/doc/cfgutils_admin.xml @@ -243,12 +243,13 @@ rand_get_prob(); <itemizedlist> <listitem> <para><emphasis>time</emphasis> - Time to wait in seconds. + It can be an integer or a variable + holding an integer. </para> </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE, BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>sleep</function> usage</title> @@ -271,13 +272,13 @@ sleep("1"); <itemizedlist> <listitem> <para><emphasis>time</emphasis> - Time to wait in micro-seconds - (1/1000000 of a second). + (1/1000000 of a second). It can be an integer or a variable + holding an integer. </para> </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE, BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>usleep</function> usage</title>

9 years, 5 months

git:master:8e2c2cbf: cfgutils: sleep() and usleep() accept vars as parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8e2c2cbf673cd18c0bd90888a75d50903d1c9984 URL: https://github.com/kamailio/kamailio/commit/8e2c2cbf673cd18c0bd90888a75d509… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-21T14:11:37+02:00 cfgutils: sleep() and usleep() accept vars as parameter --- Modified: modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2c2cbf673cd18c0bd90888a75d509… Patch: https://github.com/kamailio/kamailio/commit/8e2c2cbf673cd18c0bd90888a75d509… --- diff --git a/modules/cfgutils/cfgutils.c b/modules/cfgutils/cfgutils.c index c658892..262b21f 100644 --- a/modules/cfgutils/cfgutils.c +++ b/modules/cfgutils/cfgutils.c @@ -157,9 +157,9 @@ static cmd_export_t cmds[]={ ANY_ROUTE}, {"rand_event", (cmd_function)rand_event, 0, 0, 0, ANY_ROUTE}, - {"sleep", (cmd_function)m_sleep, 1, fixup_uint_null, 0, + {"sleep", (cmd_function)m_sleep, 1, fixup_igp_null, 0, ANY_ROUTE}, - {"usleep", (cmd_function)m_usleep, 1, fixup_uint_null, 0, + {"usleep", (cmd_function)m_usleep, 1, fixup_igp_null, 0, ANY_ROUTE}, {"abort", (cmd_function)dbg_abort, 0, 0, 0, ANY_ROUTE}, @@ -766,15 +766,27 @@ static int pv_get_random_val(struct sip_msg *msg, pv_param_t *param, static int m_sleep(struct sip_msg *msg, char *time, char *str2) { - LM_DBG("sleep %lu seconds\n", (unsigned long)time); - sleep((unsigned int)(unsigned long)time); + int s; + if(fixup_get_ivalue(msg, (gparam_t*)time, &s)!=0) + { + LM_ERR("cannot get time interval value\n"); + return -1; + } + LM_DBG("sleep %lu seconds\n", (unsigned long)s); + sleep((unsigned int)s); return 1; } static int m_usleep(struct sip_msg *msg, char *time, char *str2) { + int s; + if(fixup_get_ivalue(msg, (gparam_t*)time, &s)!=0) + { + LM_ERR("cannot get time interval value\n"); + return -1; + } LM_DBG("sleep %lu microseconds\n", (unsigned long)time); - sleep_us((unsigned int)(unsigned long)time); + sleep_us((unsigned int)s); return 1; }

9 years, 5 months

git:master:d83fee0a: lib/srdb1: dummy string for null values pointed to static buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d83fee0a31f292af731269cbd361db39be0a4b9b URL: https://github.com/kamailio/kamailio/commit/d83fee0a31f292af731269cbd361db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-07-21T11:13:18+02:00 lib/srdb1: dummy string for null values pointed to static buffer - allow editing in upper layers, avoiding innaproriate access to a constant --- Modified: lib/srdb1/db_val.c --- Diff: https://github.com/kamailio/kamailio/commit/d83fee0a31f292af731269cbd361db3… Patch: https://github.com/kamailio/kamailio/commit/d83fee0a31f292af731269cbd361db3… --- diff --git a/lib/srdb1/db_val.c b/lib/srdb1/db_val.c index 4a1b0a7..67f52a7 100644 --- a/lib/srdb1/db_val.c +++ b/lib/srdb1/db_val.c @@ -44,6 +44,7 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l, const unsigned int _cpy) { static str dummy_string = {"", 0}; + static char dummy_string_buf[2]; if (!_v) { LM_ERR("invalid parameter value\n"); @@ -57,6 +58,8 @@ int db_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l, * string so that we do not crash when the NULL flag * is set but the module does not check it properly */ + dummy_string_buf[0] = '\0'; + dummy_string.s = dummy_string_buf; VAL_STRING(_v) = dummy_string.s; VAL_STR(_v) = dummy_string; VAL_BLOB(_v) = dummy_string;

9 years, 5 months

git:master:85fc1db8: modules/ims_charging: allow ro session id to be used from cfg file as avp

by Richard Good

Module: kamailio Branch: master Commit: 85fc1db80d246effdef55d6244914e1cb73a76ab URL: https://github.com/kamailio/kamailio/commit/85fc1db80d246effdef55d6244914e1… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-07-21T10:52:25+02:00 modules/ims_charging: allow ro session id to be used from cfg file as avp --- Modified: modules/ims_charging/doc/ims_charging_admin.xml Modified: modules/ims_charging/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/85fc1db80d246effdef55d6244914e1… Patch: https://github.com/kamailio/kamailio/commit/85fc1db80d246effdef55d6244914e1… --- diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index a00b126..789690f 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -815,6 +815,27 @@ route[CHARGING_CCR_REPLY] </programlisting> </example> </section> + + <section> + <title><function moreinfo="none">Ro_set_session_id_avp()</function> + </title> + + <para>Sets the Ro session ID to an AVP for use in the config file</para> + + <para>This function can be used from REQUEST_ROUTE or ONREPLY_ROUTE.</para> + + <example> + <title>Ro_set_session_id_avp</title> + + <programlisting format="linespecific"> +... + Ro_set_session_id_avp(); + xlog("L_DBG","Ro session AVP has been set: $avp(ro_session_id)\n"); +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index 2b45f72..a0d94b2 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -83,10 +83,15 @@ static void mod_destroy(void); static int w_ro_ccr(struct sip_msg *msg, char* route_name, char* direction, int reservation_units, char* incoming_trunk_id, char* outgoing_trunk_id); //void ro_session_ontimeout(struct ro_tl *tl); + +int create_response_avp_string(char* name, str* val); +static int w_ro_set_session_id_avp(struct sip_msg *msg, char *str1, char *str2); + static int ro_fixup(void **param, int param_no); static cmd_export_t cmds[] = { { "Ro_CCR", (cmd_function) w_ro_ccr, 5, ro_fixup, 0, REQUEST_ROUTE }, + { "Ro_set_session_id_avp", (cmd_function) w_ro_set_session_id_avp, 0, 0, 0, REQUEST_ROUTE | ONREPLY_ROUTE }, { 0, 0, 0, 0, 0, 0 } }; @@ -311,6 +316,52 @@ static void mod_destroy(void) { } +int create_response_avp_string(char* name, str* val) { + int rc; + int_str avp_val, avp_name; + avp_name.s.s = name; + avp_name.s.len = strlen(name); + + avp_val.s = *val; + + rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, avp_name, avp_val); + + if (rc < 0) + LM_ERR("couldnt create AVP\n"); + else + LM_INFO("created AVP successfully : [%.*s] - [%.*s]\n", avp_name.s.len, avp_name.s.s, val->len, val->s); + + return 1; +} + +//This function gets the dlg from the current msg, gets the ro_session from the dlg and sets a AVP for use in the cfg file: ro_session_id +static int w_ro_set_session_id_avp(struct sip_msg *msg, char *str1, char *str2) { + struct ro_session *ro_session = 0; + struct dlg_cell* dlg; + int res = -1; + + //get dlg from msg + dlg = dlgb.get_dlg(msg); + if (!dlg) { + LM_ERR("Unable to find dialog and cannot do Ro charging without it\n"); + return RO_RETURN_ERROR; + } + + //get ro session id from dialog + ro_session= lookup_ro_session(dlg->h_entry, &dlg->callid, 0, 0); + if(!ro_session) { + LM_ERR("Unable to find Ro charging data\n"); + return RO_RETURN_ERROR; + } + + //set avp response with session id + res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); + return res; +} + + + + static int w_ro_ccr(struct sip_msg *msg, char* c_route_name, char* c_direction, int reservation_units, char* c_incoming_trunk_id, char* c_outgoing_trunk_id) { /* PSEUDOCODE/NOTES * 1. What mode are we in - terminating or originating

9 years, 5 months

[kamailio] janssonrpc-c does not return results if no route option specified (#256)

by Laurent Debacker

Experimenting janssonrpc-c, I noticed that I can't get anythin in the result variable, if no "route" option is specified. 1/ With "route" option, everything is OK: janssonrpc_request("local", "bar.PIC1", '{"cli": "$avp(cli)","en": "$avp(cld)"}', "route=RPC_Init_Resp,retry=1"); route[RPC_Init_Resp] { xlog("JANSSON result: $var(result)\n"); The "xlog" returns the json formatted results as expected: JANSSON result: {"result":{"NetScenario":"PreCall","cli":"123456789","en":"9876543210Destination":"sip:xxx@xx.x.xx.xxx:xxxx","NextRPC":"bar.PIC2"}} 2/ The exact same request, without the route option does not return anything: janssonrpc_request("local", "bar.PIC1", '{"cli": "$avp(cli)","en": "$avp(cld)"}'); xlog("JANSSON result: $var(result)\n"); The "xlog" returns 0 this time: JANSSON result: 0 A tshark trace indicates the same response is returned by the jsonrpc server, excluding a potential issue on this side. I am available for futher information Best regards, Laurent. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/256

9 years, 5 months

git:master:ed894111: core: fix mips compilation

by Victor Seva

Module: kamailio Branch: master Commit: ed894111f6f15170f87336bfa73ec4e8fce1c7d1 URL: https://github.com/kamailio/kamailio/commit/ed894111f6f15170f87336bfa73ec4e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-20T20:47:26+02:00 core: fix mips compilation Patch from http://anonscm.debian.org/cgit/pkg-voip/kamailio.git/tree/debian/patches/fi… by Dejan Latinovic <Dejan.Latinovic(a)imgtec.com> --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ed894111f6f15170f87336bfa73ec4e… Patch: https://github.com/kamailio/kamailio/commit/ed894111f6f15170f87336bfa73ec4e… --- diff --git a/Makefile.defs b/Makefile.defs index d663acf..fc3a578 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1318,12 +1318,13 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -mips2 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER)))) - CFLAGS+=-minline-all-stringops -ftree-vectorize \ - -fno-strict-overflow + CFLAGS+=-ftree-vectorize -fno-strict-overflow + # not supported on mips: -minline-all-stringops else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CFLAGS+=-minline-all-stringops -ftree-vectorize + CFLAGS+=-ftree-vectorize + # not supported on mips: -minline-all-stringops else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4) @@ -1363,12 +1364,14 @@ ifeq ($(CC_NAME), gcc) CFLAGS= -mips64 $(CC_OPT) -funroll-loops $(PROFILE) #if gcc 5.0+, 4.5+ or 4.2+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER)))) - CFLAGS+=-minline-all-stringops -ftree-vectorize \ - -fno-strict-overflow + CFLAGS+=-ftree-vectorize -fno-strict-overflow + # not supported on mips: -minline-all-stringops + else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) - CFLAGS+=-minline-all-stringops -ftree-vectorize + CFLAGS+=-ftree-vectorize + # not supported on mips: -minline-all-stringops else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4)

9 years, 5 months

git:master:e066edee: Merge pull request #258 from kamailio/vseva/kex_fix_date

by Victor Seva

Module: kamailio Branch: master Commit: e066edee83e468f8257b6268eae8fc532141b717 URL: https://github.com/kamailio/kamailio/commit/e066edee83e468f8257b6268eae8fc5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-20T20:11:22+02:00 Merge pull request #258 from kamailio/vseva/kex_fix_date kex: support VERSION_NODATE and VERSION_DATE for reproducible builds --- Modified: modules/kex/mi_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e066edee83e468f8257b6268eae8fc5… Patch: https://github.com/kamailio/kamailio/commit/e066edee83e468f8257b6268eae8fc5… --- diff --git a/modules/kex/mi_core.c b/modules/kex/mi_core.c index 9174809..9a1dcc8 100644 --- a/modules/kex/mi_core.c +++ b/modules/kex/mi_core.c @@ -51,7 +51,15 @@ #include "../../cfg/cfg.h" #include "../../cfg/cfg_ctx.h" +#ifdef VERSION_NODATE +#define BUILD_STR __FILE__ " compiled with " COMPILER "\n" +#else +#ifdef VERSION_DATE +#define BUILD_STR __FILE__ " compiled on " VERSION_DATE " with " COMPILER "\n" +#else #define BUILD_STR __FILE__ " compiled on "__TIME__ " " __DATE__ " with " COMPILER "\n" +#endif +#endif #define BUILD_STR_LEN (sizeof(BUILD_STR)-1) #ifndef SVNREVISION

9 years, 5 months

git:master:8f1fbd7b: kex: support VERSION_NODATE and VERSION_DATE for reproducible builds

by Victor Seva

Module: kamailio Branch: master Commit: 8f1fbd7b17440b1b7d87cbee5793ae9b1adebf90 URL: https://github.com/kamailio/kamailio/commit/8f1fbd7b17440b1b7d87cbee5793ae9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-07-20T19:38:32+02:00 kex: support VERSION_NODATE and VERSION_DATE for reproducible builds support added e03d1279f49709e0d320478fa1ff7c27161c30ed Related: #60 --- Modified: modules/kex/mi_core.c --- Diff: https://github.com/kamailio/kamailio/commit/8f1fbd7b17440b1b7d87cbee5793ae9… Patch: https://github.com/kamailio/kamailio/commit/8f1fbd7b17440b1b7d87cbee5793ae9… --- diff --git a/modules/kex/mi_core.c b/modules/kex/mi_core.c index 9174809..9a1dcc8 100644 --- a/modules/kex/mi_core.c +++ b/modules/kex/mi_core.c @@ -51,7 +51,15 @@ #include "../../cfg/cfg.h" #include "../../cfg/cfg_ctx.h" +#ifdef VERSION_NODATE +#define BUILD_STR __FILE__ " compiled with " COMPILER "\n" +#else +#ifdef VERSION_DATE +#define BUILD_STR __FILE__ " compiled on " VERSION_DATE " with " COMPILER "\n" +#else #define BUILD_STR __FILE__ " compiled on "__TIME__ " " __DATE__ " with " COMPILER "\n" +#endif +#endif #define BUILD_STR_LEN (sizeof(BUILD_STR)-1) #ifndef SVNREVISION

9 years, 5 months

[kamailio] kex: support VERSION_NODATE and VERSION_DATE for reproducible builds (#258)

by Victor Seva

support added e03d1279f49709e0d320478fa1ff7c27161c30ed Related: #60 See https://reproducible.debian.net/dbd/unstable/amd64/kamailio_4.3.0-1.debbind… for results using -DVERSION_NODATE You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/258 -- Commit Summary -- * kex: support VERSION_NODATE and VERSION_DATE for reproducible builds -- File Changes -- M modules/kex/mi_core.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/258.patch https://github.com/kamailio/kamailio/pull/258.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/258

9 years, 5 months

Kamailio v4.3.1 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v4.3.1 stable release is out. This is a maintenance release of the latest stable branch, 4.3, that includes fixes since release of v4.3.0. There is no change to database schema or configuration language structure that you have to do on installations of v4.3.0. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.3.1. For more details about version 4.3.1 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2015/07/kamailio-v4-3-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 5 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2015