sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:4.3:0aaa2dd0: tsilo: unref the transaction after appending new branches
by Federico Cabiddu 08 Oct '15

08 Oct '15

Module: kamailio Branch: 4.3 Commit: 0aaa2dd0afab46cb35e88d4091a9118066682059 URL: https://github.com/kamailio/kamailio/commit/0aaa2dd0afab46cb35e88d4091a9118… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-10-08T08:19:39+02:00 tsilo: unref the transaction after appending new branches (cherry picked from commit 3c086a85b99d59dabc48f77893d4c68199af0577) --- Modified: modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/0aaa2dd0afab46cb35e88d4091a9118… Patch: https://github.com/kamailio/kamailio/commit/0aaa2dd0afab46cb35e88d4091a9118… --- diff --git a/modules/tsilo/ts_append.c b/modules/tsilo/ts_append.c index 100fcec..99cf89e 100644 --- a/modules/tsilo/ts_append.c +++ b/modules/tsilo/ts_append.c @@ -49,9 +49,9 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { if (res != 0) { LM_ERR("failed to retrieve record for %.*s\n", ruri->len, ruri->s); - unlock_entry_by_ruri(ruri); - return -1; - } + unlock_entry_by_ruri(ruri); + return -1; + } ptr = _r->transactions; @@ -68,24 +68,32 @@ int ts_append(struct sip_msg* msg, str *ruri, char *table) { int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { struct cell *t; + struct cell *orig_t; struct sip_msg *orig_msg; int ret; + orig_t = _tmb.t_gett(); + if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) { LM_ERR("transaction [%u:%u] not found\n", tindex, tlabel); - return -1; + ret = -1; + goto done; } + if (t->flags & T_CANCELED) { LM_DBG("trasaction [%u:%u] was cancelled\n", tindex, tlabel); - return -2; + ret = -2; + goto done; } + if (t->uas.status >= 200) { LM_DBG("trasaction [%u:%u] sent out a final response already - %d\n", tindex, tlabel, t->uas.status); - return -3; + ret = -3; + goto done; } orig_msg = t->uas.request; @@ -93,8 +101,17 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table) { ret = _regapi.lookup_to_dset(orig_msg, table, NULL); if(ret != 1) { LM_DBG("transaction %u:%u: error updating dset (%d)\n", tindex, tlabel, ret); - return -4; + ret = -4; + goto done; } - - return _tmb.t_append_branches(); + + ret = _tmb.t_append_branches(); + +done: + /* unref the transaction which had been referred by t_lookup_ident() call. + * Restore the original transaction (if any) */ + _tmb.unref_cell(t); + _tmb.t_sett(orig_t, T_BR_UNDEFINED); + + return ret; }

1 0

rfc: event route when kamailio starts
by Daniel-Constantin Mierla 08 Oct '15

08 Oct '15

Hello, based on a recent discussion with Alex Balashov (at Kazoocon this week), I pushed a patch that enables the execution of event_route[core:worker-one-init] when kamailio is started. It would be more like an alternative for event_route[htable:mod-init], for the cases when htable is not used, but also should ensure that all the modules are initialized. Moreover, because most of the modules close connection in mod init, I though of doing it when child one (udp receiver) initialization for all modules is finished, which means that all is ready for runtime, still this is before receiving any packet. On the other hand, forking is done by main process, so other children can start listening for sip. More or less what I want to ask here is whether the forking of the other children should wait until the event_route[core:worker-one-init] is finished (e.g., what is done in this event route is important before any sip packet is routed) or just leave it like it is. Worth to say that some modules do special processing in child init of worker one, like usrloc module loads the records from database to memory, which means that overall start of kamailio could be slower. Also, if there are time consuming actions in the event_route[core:worker-one-init], getting to the stage of routing sip packets will take longer. What would you find important, fork the other processes so routing sip will happen as soon as possible, or block until execution ofevent_route[core:worker-one-init] is finished. I guess that making it cusomizable in some way would be a solution, but knowing what use cases would be important may help in reducing the complexity to get it enabled. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com

2 1

git:4.3:42f3e1f0: tm: fake msg and environment to append new branches
by Federico Cabiddu 07 Oct '15

07 Oct '15

Module: kamailio Branch: 4.3 Commit: 42f3e1f081d2606a500f93e5e1fd8c97690956de URL: https://github.com/kamailio/kamailio/commit/42f3e1f081d2606a500f93e5e1fd8c9… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-10-07T16:34:08+02:00 tm: fake msg and environment to append new branches (cherry picked from commit 6845d190f46de820fa4586b30eb2fba0aae1eb01) --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/42f3e1f081d2606a500f93e5e1fd8c9… Patch: https://github.com/kamailio/kamailio/commit/42f3e1f081d2606a500f93e5e1fd8c9…

1 0

[kamailio] tm: fake msg and environment to append new branches (#346)
by Federico Cabiddu 07 Oct '15

07 Oct '15

This fix try to solve the crash reported in http://lists.sip-router.org/pipermail/sr-users/2015-September/089846.html. The cause of the crash was that the sip message used to append branch was the shmem clone of the original message. When the new branches were going through their configured branch route, modifications done by other modules' function (like rtpproxy) were applied to this stored copy directly, causing the crash once a failure route was run. This patch take the same approach as the failure handler one, creating a fake request from the origin message and using this one to append branches. I am not sure if this is a good approach, since the appended branch are going through the branch route and some function called there could not be compatible with a faked request. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/346 -- Commit Summary -- * tm: fake msg and environment to append new branches -- File Changes -- M modules/tm/t_append_branches.c (54) -- Patch Links -- https://github.com/kamailio/kamailio/pull/346.patch https://github.com/kamailio/kamailio/pull/346.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/346

2 5

git:master:3de200b3: Merge pull request #346 from grumvalski/t_append_branches_fix
by Federico Cabiddu 07 Oct '15

07 Oct '15

Module: kamailio Branch: master Commit: 3de200b3c965586b3dd9370eca073f10c556e3b3 URL: https://github.com/kamailio/kamailio/commit/3de200b3c965586b3dd9370eca073f1… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-10-07T16:20:43+02:00 Merge pull request #346 from grumvalski/t_append_branches_fix tm: fake msg and environment to append new branches --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/3de200b3c965586b3dd9370eca073f1… Patch: https://github.com/kamailio/kamailio/commit/3de200b3c965586b3dd9370eca073f1…

1 0

git:master:6845d190: tm: fake msg and environment to append new branches
by Federico Cabiddu 07 Oct '15

07 Oct '15

Module: kamailio Branch: master Commit: 6845d190f46de820fa4586b30eb2fba0aae1eb01 URL: https://github.com/kamailio/kamailio/commit/6845d190f46de820fa4586b30eb2fba… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-09-28T09:09:59+02:00 tm: fake msg and environment to append new branches --- Modified: modules/tm/t_append_branches.c --- Diff: https://github.com/kamailio/kamailio/commit/6845d190f46de820fa4586b30eb2fba… Patch: https://github.com/kamailio/kamailio/commit/6845d190f46de820fa4586b30eb2fba…

1 0

git:master:7185a8a7: modules/ims_charging: set the last_event timestamp if there was failure to get credit
by jaybeepee 07 Oct '15

07 Oct '15

Module: kamailio Branch: master Commit: 7185a8a708001a6e2d2150e2541880c04c2374b4 URL: https://github.com/kamailio/kamailio/commit/7185a8a708001a6e2d2150e2541880c… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2015-10-07T15:48:53+02:00 modules/ims_charging: set the last_event timestamp if there was failure to get credit --- Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/7185a8a708001a6e2d2150e2541880c… Patch: https://github.com/kamailio/kamailio/commit/7185a8a708001a6e2d2150e2541880c… --- diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index 4e1c268..df1fc59 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -332,6 +332,7 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { /* just put the timer back in with however many seconds are left (if any!!! in which case we need to kill */ /* also update the event type to no_more_credit to save on processing the next time we get here */ i_req->ro_session->event_type = no_more_credit; + i_req->ro_session->last_event_timestamp = get_current_time_micro(); int whatsleft = i_req->ro_session->reserved_secs - used_secs; if (whatsleft <= 0) { // TODO we need to handle this situation more precisely.

1 0

git:master:b3d38eac: core: new feature to execute event_route[core:worker-one-init]
by Daniel-Constantin Mierla 07 Oct '15

07 Oct '15

Module: kamailio Branch: master Commit: b3d38eac7a24bff88a1ec555aa5a50ea5c3f0232 URL: https://github.com/kamailio/kamailio/commit/b3d38eac7a24bff88a1ec555aa5a50e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-07T12:14:24+02:00 core: new feature to execute event_route[core:worker-one-init] - the event_route[core:worker-one-init] is executed if defined in kamailio.cfg after the first udp sip worker process executed the child_init() for all modules, before starting to process sip traffic - note that due to forking, other sip workers can get faster to listening for sip traffic --- Modified: action.c Modified: action.h Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/b3d38eac7a24bff88a1ec555aa5a50e… Patch: https://github.com/kamailio/kamailio/commit/b3d38eac7a24bff88a1ec555aa5a50e… --- diff --git a/action.c b/action.c index 726c000..bef3ec6 100644 --- a/action.c +++ b/action.c @@ -49,6 +49,7 @@ #include "globals.h" #include "dset.h" #include "onsend.h" +#include "fmsg.h" #include "resolve.h" #ifdef USE_TCP #include "tcp_server.h" @@ -1635,3 +1636,36 @@ int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx *c) setsflagsval(sfbk); return ret; } + + +/** + * + */ +int run_child_one_init_route(void) +{ + struct sip_msg *fmsg; + struct run_act_ctx ctx; + int rtb, rt; + + LM_DBG("attempting to run event_route[core:worker-one-init]\n"); + + rt = route_get(&event_rt, "core:worker-one-init"); + if(rt>=0 && event_rt.rlist[rt]!=NULL) { + LM_DBG("executing event_route[core:worker-one-init] (%d)\n", rt); + if(faked_msg_init()<0) + return -1; + fmsg = faked_msg_next(); + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, &ctx); + if(ctx.run_flags&DROP_R_F) + { + LM_ERR("exit due to 'drop' in event route\n"); + return -1; + } + set_route_type(rtb); + } + + return 0; +} diff --git a/action.h b/action.h index d6f7810..62eed0c 100644 --- a/action.h +++ b/action.h @@ -75,4 +75,6 @@ int run_actions_safe(struct run_act_ctx* c, struct action* a, void log_prefix_set(sip_msg_t *msg); +int run_child_one_init_route(void); + #endif diff --git a/main.c b/main.c index 3970db8..a4407fa 100644 --- a/main.c +++ b/main.c @@ -1228,6 +1228,7 @@ int main_loop(void) int r; #endif int nrprocs; + int woneinit; /* one "main" process and n children handling i/o */ if (dont_fork){ @@ -1544,6 +1545,7 @@ int main_loop(void) if (counters_prefork_init(get_max_procs()) == -1) goto error; + woneinit = 0; /* udp processes */ for(si=udp_listen; si; si=si->next){ nrprocs = (si->workers>0)?si->workers:children_no; @@ -1580,8 +1582,13 @@ int main_loop(void) #ifdef STATS setstats( i+r*children_no ); #endif + if(woneinit==0) { + if(run_child_one_init_route()<0) + goto error; + } return udp_rcv_loop(); } + woneinit = 1; } /*parent*/ /*close(udp_sock)*/; /*if it's closed=>sendto invalid fd errors?*/

2 2

git:master:e9eea6bc: nathelper Remove SVN IDs
by Olle E. Johansson 07 Oct '15

07 Oct '15

Module: kamailio Branch: master Commit: e9eea6bc7adcf21ce6217597e749deb6111a115b URL: https://github.com/kamailio/kamailio/commit/e9eea6bc7adcf21ce6217597e749deb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-07T15:33:39+02:00 nathelper Remove SVN IDs --- Modified: modules/nathelper/examples/4to6.cfg Modified: modules/nathelper/examples/alg.cfg Modified: modules/nathelper/nathelper.c Modified: modules/nathelper/nathelper.h Modified: modules/nathelper/nhelpr_funcs.c Modified: modules/nathelper/nhelpr_funcs.h Modified: modules/nathelper/sip_pinger.h --- Diff: https://github.com/kamailio/kamailio/commit/e9eea6bc7adcf21ce6217597e749deb… Patch: https://github.com/kamailio/kamailio/commit/e9eea6bc7adcf21ce6217597e749deb… --- diff --git a/modules/nathelper/examples/4to6.cfg b/modules/nathelper/examples/4to6.cfg index 5dd5ba9..79ef85f 100644 --- a/modules/nathelper/examples/4to6.cfg +++ b/modules/nathelper/examples/4to6.cfg @@ -1,4 +1,4 @@ -# $Id$ +# # # Simple application level gateway config script. # diff --git a/modules/nathelper/examples/alg.cfg b/modules/nathelper/examples/alg.cfg index d2678a5..4513391 100644 --- a/modules/nathelper/examples/alg.cfg +++ b/modules/nathelper/examples/alg.cfg @@ -1,4 +1,4 @@ -# $Id$ +# # # Simple application level gateway config script. # diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 5f20a5f..66a4d0f 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (C) 2003-2008 Sippy Software, Inc., http://www.sippysoft.com * * This file is part of Kamailio, a free SIP server. diff --git a/modules/nathelper/nathelper.h b/modules/nathelper/nathelper.h index 8cc7b95..46bdc5f 100644 --- a/modules/nathelper/nathelper.h +++ b/modules/nathelper/nathelper.h @@ -1,5 +1,4 @@ -/* $Id: nathelper.c 1808 2007-03-10 17:36:19Z bogdan_iancu $ - * +/* * Copyright (C) 2003 Porta Software Ltd * * This file is part of Kamailio, a free SIP server. diff --git a/modules/nathelper/nhelpr_funcs.c b/modules/nathelper/nhelpr_funcs.c index 756337d..049cd31 100644 --- a/modules/nathelper/nhelpr_funcs.c +++ b/modules/nathelper/nhelpr_funcs.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright (C) 2001-2003 FhG Fokus * diff --git a/modules/nathelper/nhelpr_funcs.h b/modules/nathelper/nhelpr_funcs.h index f787edd..94791e9 100644 --- a/modules/nathelper/nhelpr_funcs.h +++ b/modules/nathelper/nhelpr_funcs.h @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright (C) 2001-2003 FhG Fokus * diff --git a/modules/nathelper/sip_pinger.h b/modules/nathelper/sip_pinger.h index 0ff60b1..4b45f48 100644 --- a/modules/nathelper/sip_pinger.h +++ b/modules/nathelper/sip_pinger.h @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Copyright (C) 2005 Voice System SRL * * This file is part of Kamailio, a free SIP server.

1 0

Errored: kamailio/kamailio#1409 (4.3 - 74042e3)
by Travis CI 07 Oct '15

07 Oct '15

Build Update for kamailio/kamailio ------------------------------------- Build: #1409 Status: Errored Duration: 11 minutes and 55 seconds Commit: 74042e3 (4.3) Author: Olle E. Johansson Message: nathelper Via header for SIP ping over IPv6 needs square brackets (cherry picked from commit 274f1034bfb9ea0d52ef291d2f95021ca86f3081) View the changeset: https://github.com/kamailio/kamailio/compare/b7678a7c920f...74042e3c00ed View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/84079001 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015