sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:b293eb21: tsilo: updated with the latest changes to registrar api
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: b293eb2137a6c34cc169ee46b2d349deeefa66ec URL: https://github.com/kamailio/kamailio/commit/b293eb2137a6c34cc169ee46b2d349d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T20:38:07+02:00 tsilo: updated with the latest changes to registrar api --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/b293eb2137a6c34cc169ee46b2d349d… Patch: https://github.com/kamailio/kamailio/commit/b293eb2137a6c34cc169ee46b2d349d… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index db47fdf..2a8b04b 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -86,6 +86,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * struct cell *orig_t; struct sip_msg *orig_msg; int ret; + str stable; orig_t = _tmb.t_gett(); @@ -113,10 +114,12 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * orig_msg = t->uas.request; + stable.s = table; + stable.len = strlen(stable.s); if(uri==NULL || uri->s==NULL || uri->len<=0) { - ret = _regapi.lookup_to_dset(orig_msg, table, NULL); + ret = _regapi.lookup_to_dset(orig_msg, &stable, NULL); } else { - ret = _regapi.lookup_to_dset(orig_msg, table, uri); + ret = _regapi.lookup_to_dset(orig_msg, &stable, uri); } if(ret != 1) { @@ -124,14 +127,14 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * ret = -4; goto done; } - + ret = _tmb.t_append_branches(); done: - /* unref the transaction which had been referred by t_lookup_ident() call. + /* unref the transaction which had been referred by t_lookup_ident() call. * Restore the original transaction (if any) */ if(t) _tmb.unref_cell(t); _tmb.t_sett(orig_t, T_BR_UNDEFINED); - + return ret; }

1 0

git:master:c348d284: app_lua: updated old lua api with the changes to registrar module
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: c348d284d4b6c6cff67c42d3d52bfcd60530da7d URL: https://github.com/kamailio/kamailio/commit/c348d284d4b6c6cff67c42d3d52bfcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T20:35:45+02:00 app_lua: updated old lua api with the changes to registrar module --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/c348d284d4b6c6cff67c42d3d52bfcd… Patch: https://github.com/kamailio/kamailio/commit/c348d284d4b6c6cff67c42d3d52bfcd…

1 0

git:master:c652cc75: registrar: inter-module api updated to use str for location table
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: c652cc751c1b8e32df93b91ad1a2f05764327e3a URL: https://github.com/kamailio/kamailio/commit/c652cc751c1b8e32df93b91ad1a2f05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T20:25:45+02:00 registrar: inter-module api updated to use str for location table --- Modified: modules/registrar/api.c Modified: modules/registrar/api.h --- Diff: https://github.com/kamailio/kamailio/commit/c652cc751c1b8e32df93b91ad1a2f05… Patch: https://github.com/kamailio/kamailio/commit/c652cc751c1b8e32df93b91ad1a2f05…

1 0

git:master:90350e2a: registrar: coherent indentation and whitespacing
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: 90350e2a71c86e71f81590c80ad714cec6c7ea80 URL: https://github.com/kamailio/kamailio/commit/90350e2a71c86e71f81590c80ad714c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T20:13:44+02:00 registrar: coherent indentation and whitespacing --- Modified: modules/registrar/api.c Modified: modules/registrar/api.h Modified: modules/registrar/common.c Modified: modules/registrar/common.h Modified: modules/registrar/config.c Modified: modules/registrar/config.h Modified: modules/registrar/lookup.c Modified: modules/registrar/lookup.h Modified: modules/registrar/path.c Modified: modules/registrar/path.h Modified: modules/registrar/registrar.c Modified: modules/registrar/registrar.h Modified: modules/registrar/regpv.c Modified: modules/registrar/regpv.h Modified: modules/registrar/regtime.c Modified: modules/registrar/regtime.h Modified: modules/registrar/reply.h Modified: modules/registrar/rerrno.c Modified: modules/registrar/save.h Modified: modules/registrar/sip_msg.c Modified: modules/registrar/sip_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/90350e2a71c86e71f81590c80ad714c… Patch: https://github.com/kamailio/kamailio/commit/90350e2a71c86e71f81590c80ad714c…

1 0

git:master:e78c8572: sanity: exported sanity_check(...) to kemi
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: e78c8572b27ef777244d3b2376273c940144db03 URL: https://github.com/kamailio/kamailio/commit/e78c8572b27ef777244d3b2376273c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T19:31:31+02:00 sanity: exported sanity_check(...) to kemi --- Modified: modules/sanity/mod_sanity.c Modified: modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/e78c8572b27ef777244d3b2376273c9… Patch: https://github.com/kamailio/kamailio/commit/e78c8572b27ef777244d3b2376273c9…

1 0

git:master:fd8c6a26: sl: exported sl_reply_error() to kemi
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: fd8c6a26bbfbedc3a8dc1ffb529b0a473786df63 URL: https://github.com/kamailio/kamailio/commit/fd8c6a26bbfbedc3a8dc1ffb529b0a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T19:20:30+02:00 sl: exported sl_reply_error() to kemi --- Modified: modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/fd8c6a26bbfbedc3a8dc1ffb529b0a4… Patch: https://github.com/kamailio/kamailio/commit/fd8c6a26bbfbedc3a8dc1ffb529b0a4… --- diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 2cd780f..60e075a 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -106,24 +106,24 @@ static param_export_t params[] = { {"default_reason", PARAM_STR, &default_reason}, {"bind_tm", PARAM_INT, &sl_bind_tm}, - {0, 0, 0} + {0, 0, 0} }; - + #ifdef STATIC_SL struct module_exports sl_exports = { #else struct module_exports exports= { #endif - "sl", - cmds, - sl_rpc, /* RPC methods */ - params, /* param exports */ - mod_init, /* module initialization function */ - (response_function) 0, - mod_destroy, - 0, - child_init /* per-child init function */ + "sl", + cmds, + sl_rpc, /* RPC methods */ + params, /* param exports */ + mod_init, /* module initialization function */ + (response_function) 0, + mod_destroy, + 0, + child_init /* per-child init function */ }; @@ -200,17 +200,17 @@ static void mod_destroy() */ static int w_sl_send_reply(struct sip_msg* msg, char* p1, char* p2) { - int code, ret; - str reason; - char* r; + int code, ret; + str reason; + char* r; - if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { code = default_code; - } - - if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + } + + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { reason = default_reason; - } + } if(reason.s[reason.len-1]=='\0') { r = reason.s; @@ -219,8 +219,9 @@ static int w_sl_send_reply(struct sip_msg* msg, char* p1, char* p2) if (r == NULL) r = default_reason.s; } ret = sl_send_reply(msg, code, r); - if ((r!=reason.s) && (r!=default_reason.s)) pkg_free(r); - return ret; + if ((r!=reason.s) && (r!=default_reason.s)) pkg_free(r); + + return ret; } @@ -245,7 +246,7 @@ static int w_sl_reply_error( struct sip_msg* msg, char* str, char* str2) */ int send_reply(struct sip_msg *msg, int code, str *reason) { - char *r = NULL; + char *r = NULL; struct cell *t; int ret = 1; @@ -295,16 +296,16 @@ int send_reply(struct sip_msg *msg, int code, str *reason) */ static int w_send_reply(struct sip_msg* msg, char* p1, char* p2) { - int code; - str reason; + int code; + str reason; - if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { + if (get_int_fparam(&code, msg, (fparam_t*)p1) < 0) { code = default_code; - } + } - if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { + if (get_str_fparam(&reason, msg, (fparam_t*)p2) < 0) { reason = default_reason; - } + } return send_reply(msg, code, &reason); } @@ -515,6 +516,11 @@ static sr_kemi_t sl_kemi_exports[] = { { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sl"), str_init("sl_reply_error"), + SR_KEMIP_INT, sl_reply_error, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:912c27f6: siputils: exported several functions to kemi
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: 912c27f68fbd5aa6ce4c0bfbf24e2eba9f0b1ac3 URL: https://github.com/kamailio/kamailio/commit/912c27f68fbd5aa6ce4c0bfbf24e2eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T19:13:56+02:00 siputils: exported several functions to kemi - has_totag(), is_request(), is_reply(), is_first_hop() --- Modified: modules/siputils/checks.c Modified: modules/siputils/checks.h Modified: modules/siputils/sipops.c Modified: modules/siputils/sipops.h Modified: modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/912c27f68fbd5aa6ce4c0bfbf24e2eb… Patch: https://github.com/kamailio/kamailio/commit/912c27f68fbd5aa6ce4c0bfbf24e2eb…

1 0

git:master:5a31031e: siputils: coherent indentation and whitespacing
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: 5a31031e62f8872eafc79b41e9594f2f1289f8c3 URL: https://github.com/kamailio/kamailio/commit/5a31031e62f8872eafc79b41e9594f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T18:59:38+02:00 siputils: coherent indentation and whitespacing --- Modified: modules/siputils/chargingvector.c Modified: modules/siputils/chargingvector.h Modified: modules/siputils/checks.c Modified: modules/siputils/checks.h Modified: modules/siputils/config.c Modified: modules/siputils/config.h Modified: modules/siputils/contact_ops.c Modified: modules/siputils/contact_ops.h Modified: modules/siputils/options.c Modified: modules/siputils/ring.c Modified: modules/siputils/rpid.c Modified: modules/siputils/rpid.h Modified: modules/siputils/sipops.c Modified: modules/siputils/siputils.c Modified: modules/siputils/siputils.h Modified: modules/siputils/utils.c Modified: modules/siputils/utils.h --- Diff: https://github.com/kamailio/kamailio/commit/5a31031e62f8872eafc79b41e9594f2… Patch: https://github.com/kamailio/kamailio/commit/5a31031e62f8872eafc79b41e9594f2…

1 0

git:master:72b957f6: tm: exported t_is_set() to kemi
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: 72b957f6e2a52c13af34a24d243216b53de79fcf URL: https://github.com/kamailio/kamailio/commit/72b957f6e2a52c13af34a24d243216b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T18:46:26+02:00 tm: exported t_is_set() to kemi - removed some of the function names in log messages, it is added automatically --- Modified: modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/72b957f6e2a52c13af34a24d243216b… Patch: https://github.com/kamailio/kamailio/commit/72b957f6e2a52c13af34a24d243216b… --- diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 2ff73c6..29a7326 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -866,8 +866,8 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) /* first get the transaction */ if (t_check(msg, 0 ) == -1) return -1; if ((t = get_t()) == 0) { - LOG(L_ERR, "ERROR: t_check_status: cannot check status for a reply " - "which has no T-state established\n"); + LM_ERR("cannot check status for a reply" + " which has no T-state established\n"); goto error; } backup = 0; @@ -923,12 +923,12 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) /* t_pick_branch() retuns error also when there are only * blind UACs. Let us give it another chance including the * blind branches. */ - LOG(L_DBG, "DEBUG: t_check_status: t_pick_branch returned error, " - "trying t_pick_branch_blind\n"); + LM_DBG("t_pick_branch returned error," + " trying t_pick_branch_blind\n"); ret = t_pick_branch_blind(t, &lowest_status); } if (ret < 0) { - LOG(L_CRIT,"BUG:t_check_status: t_pick_branch failed to get " + LM_CRIT("BUG: t_pick_branch failed to get" " a final response in FAILURE_ROUTE\n"); goto error; } @@ -938,12 +938,12 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) status = int2str(t->uac[get_t_branch()].last_received, 0); break; default: - LOG(L_ERR,"ERROR:t_check_status: unsupported route type %d\n", + LM_ERR("unsupported route type %d\n", get_route_type()); goto error; } - DBG("DEBUG:t_check_status: checked status is <%s>\n",status); + LM_DBG("checked status is <%s>\n",status); /* do the checking */ n = regexec(re, status, 1, &pmatch, 0); @@ -1352,7 +1352,7 @@ inline static int w_t_on_reply( struct sip_msg* msg, char *go_to, char *foo ) } -static int w_t_is_set(struct sip_msg* msg, char *target, char *foo ) +static int t_is_set(struct sip_msg* msg, str *target) { int r; tm_cell_t *t = NULL; @@ -1361,7 +1361,7 @@ static int w_t_is_set(struct sip_msg* msg, char *target, char *foo ) t = get_t(); if (t==T_UNDEFINED) t = NULL; - switch(target[0]) { + switch(target->s[0]) { case 'b': if(t==NULL) r = get_on_branch(); @@ -1385,6 +1385,14 @@ static int w_t_is_set(struct sip_msg* msg, char *target, char *foo ) return -1; } +static int w_t_is_set(struct sip_msg* msg, char *target, char *foo) +{ + str s = STR_NULL; + + s.s = target; + return t_is_set(msg, &s); +} + static int fixup_t_is_set(void** param, int param_no) { int len; @@ -1849,8 +1857,8 @@ int t_is_canceled(struct sip_msg* msg) if (t_check( msg , 0 )==-1) return -1; t=get_t(); if ((t==0) || (t==T_UNDEFINED)){ - LOG(L_ERR, "ERROR: t_is_canceled: cannot check a message " - "for which no T-state has been established\n"); + LM_ERR("cannot check a message" + " for which no T-state has been established\n"); ret=-1; }else{ ret=(t->flags & T_CANCELED)?1:-1; @@ -1872,8 +1880,8 @@ int t_is_retr_async_reply(struct sip_msg* msg) if (t_check( msg , 0 )==-1) return -1; t=get_t(); if ((t==0) || (t==T_UNDEFINED)){ - LOG(L_ERR, "ERROR: t_is_retr_async_reply: cannot check a message " - "for which no T-state has been established\n"); + LM_ERR("cannot check a message" + " for which no T-state has been established\n"); ret=-1; }else{ LOG(L_DBG, "TRANSACTION FLAGS IS %d\n", t->flags); @@ -1881,6 +1889,7 @@ int t_is_retr_async_reply(struct sip_msg* msg) } return ret; } + static int w_t_is_retr_async_reply(struct sip_msg* msg, char* foo, char* bar) { return t_is_retr_async_reply(msg); @@ -2491,6 +2500,11 @@ static sr_kemi_t tm_kemi_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tm"), str_init("t_is_set"), + SR_KEMIP_INT, t_is_set, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:f81488f5: tmx: functions to check the routing block type exported to kemi
by Daniel-Constantin Mierla 24 Apr '16

24 Apr '16

Module: kamailio Branch: master Commit: f81488f50e2bdbd1984886f39ebb9ab5d727d284 URL: https://github.com/kamailio/kamailio/commit/f81488f50e2bdbd1984886f39ebb9ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-24T18:39:20+02:00 tmx: functions to check the routing block type exported to kemi --- Modified: modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f81488f50e2bdbd1984886f39ebb9ab… Patch: https://github.com/kamailio/kamailio/commit/f81488f50e2bdbd1984886f39ebb9ab…

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016