sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: dispatcher(k): use load_tm_api

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: fd5ddfd12c25497aa859dafc2bf65e3c07fd4529 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd5ddfd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 15 23:50:13 2010 +0100 dispatcher(k): use load_tm_api - import tm module api directly - patch by Stephen Young (styoung) --- modules_k/dispatcher/dispatcher.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 07a5f37..02ce218 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -352,26 +352,15 @@ static int mod_init(void) /***************************************************** * TM-Bindings *****************************************************/ - load_tm_f load_tm; - load_tm=(load_tm_f)find_export("load_tm", 0, 0); - - /* import the TM auto-loading function */ - if (load_tm) + if (load_tm_api( &tmb ) == -1) { - /* let the auto-loading function load all TM stuff */ - if (load_tm( &tmb ) == -1) - { - LM_ERR("could not load the TM-functions - disable DS ping\n"); - return -1; - } - /***************************************************** - * Register the PING-Timer - *****************************************************/ - register_timer(ds_check_timer, NULL, ds_ping_interval); - } else { - LM_WARN("could not bind to the TM-Module, automatic" - " re-activation disabled.\n"); + LM_ERR("could not load the TM-functions - disable DS ping\n"); + return -1; } + /***************************************************** + * Register the PING-Timer + *****************************************************/ + register_timer(ds_check_timer, NULL, ds_ping_interval); } return 0;

14 years, 10 months

[tracker] Task opened: Update to Dispatcher.c to include load_tm_api change (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Stephen Young (styoung) Attached to Project - sip-router Summary - Update to Dispatcher.c to include load_tm_api change Task Type - Improvement Category - Modules kamailio Status - Assigned Assigned To - Daniel-Constantin Mierla Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - The dispatcher module is still using find_export/load_tm instead of load_tm_api Without that the "probing" of gateways doesnt; work since the tm module can't be pulled in. Please review attached patch One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=42 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

[tracker] Assignee added: Update to Dispatcher.c to include load_tm_api change

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#42 - Update to Dispatcher.c to include load_tm_api change User who did this - Stephen Young (styoung) http://sip-router.org/tracker/index.php?do=details&task_id=42 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 10 months

[ openser-Patches-2970838 ] Patch to dispatcher since API change

by SourceForge.net

Patches item #2970838, was opened at 2010-03-15 20:21 Message generated for change (Tracker Item Submitted) made by You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=2970838&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver devel Status: Open Resolution: None Priority: 5 Private: No Submitted By: Stephen () Assigned to: Nobody/Anonymous (nobody) Summary: Patch to dispatcher since API change Initial Comment: Update of dispatcher.c to include the api change ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=2970838&group_…

14 years, 10 months

git:andrei/rve_f_params: perl(k): update api calls: s/MODULE_T/MODULE2_T/

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 1e18649d3cb322b889e6ca9ebbdd4e88015981f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e18649… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 15 20:18:40 2010 +0100 perl(k): update api calls: s/MODULE_T/MODULE2_T/ MODULE_T was obsoleted by recent changes. It was replaced by MODULE0_T, MODULE1_T and MODULE2_T. --- modules_k/perl/openserxs.xs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/perl/openserxs.xs b/modules_k/perl/openserxs.xs index 4ee86b6..998b219 100644 --- a/modules_k/perl/openserxs.xs +++ b/modules_k/perl/openserxs.xs @@ -259,7 +259,7 @@ int moduleFunc(struct sip_msg *m, char *func, return -1; } - act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + act = mk_action(MODULE2_T, 4 /* number of (type, value) pairs */, MODEXP_ST, exp_func_struct, /* function */ NUMBER_ST, 2, /* parameter number */ STRING_ST, argv[0], /* param. 1 */

14 years, 10 months

git:andrei/rve_f_params: print(s): more module function examples

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 37554f166be7c7eb9ee65ce3dfe591ad4094481a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37554f1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 15 20:14:40 2010 +0100 print(s): more module function examples Added example functions with no fixups, with 1, 2, 3 or variable number of parameters (VAR_PARAM_NO). --- modules_s/print/print.c | 51 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 3 deletions(-) diff --git a/modules_s/print/print.c b/modules_s/print/print.c index b3d6852..7c704c5 100644 --- a/modules_s/print/print.c +++ b/modules_s/print/print.c @@ -46,9 +46,13 @@ MODULE_VERSION static int print_fixup_f_1(void **param, int param_no); static int print_fixup_f_2(void **param, int param_no); -static int print_f_0(struct sip_msg*, char*,char*); -static int print_f_1(struct sip_msg*, char*,char*); -static int print_f_2(struct sip_msg*, char*,char*); +static int print_f_0(struct sip_msg*, char*, char*); +static int print_f_1(struct sip_msg*, char*, char*); +static int print_f_2(struct sip_msg*, char*, char*); +static int print_f1(struct sip_msg*, char*, char*); +static int print_f2(struct sip_msg*, char*, char*); +static int print_f3(struct sip_msg*, char*, char*, char*); +static int print_f_var(struct sip_msg*, int argc, action_u_t argv[]); static int mod_init(void); /* the parameters are not used, they are only meant as an example*/ @@ -60,6 +64,10 @@ static cmd_export_t cmds[]={ {"print", print_f_0, 0, 0, REQUEST_ROUTE}, // overload test {"print", print_f_1, 1, print_fixup_f_1, REQUEST_ROUTE}, {"print", print_f_2, 2, print_fixup_f_2, REQUEST_ROUTE}, + {"print1", print_f1, 1, 0, REQUEST_ROUTE}, + {"print2", print_f2, 2, 0, REQUEST_ROUTE}, + {"print3", (cmd_function)print_f3, 3, 0, REQUEST_ROUTE}, + {"printv", (cmd_function)print_f_var, VAR_PARAM_NO, 0, REQUEST_ROUTE}, {0, 0, 0, 0, 0} }; @@ -90,6 +98,7 @@ static int mod_init(void) DBG("print: string_param = '%s'\n", string_param); DBG("print: str_param = '%.*s'\n", str_param.len, str_param.s); DBG("print: int_param = %d\n", int_param); + WARN("this is an example module, it has no practical use\n"); return 0; } @@ -132,3 +141,39 @@ static int print_fixup_f_2(void **param, int param_no) { DBG("print: print_fixup_f_2('%s')\n", (char*)*param); return print_fixup_f(param, param_no); } + + + +/* 1 parameter, no fixup version */ +static int print_f1(struct sip_msg* msg, char* s1, char* not_used) +{ + printf("%s\n", s1); + return 1; +} + + +/* 2 parameters, no fixup version */ +static int print_f2(struct sip_msg* msg, char* s1, char* s2) +{ + printf("%s%s\n", s1, s2); + return 1; +} + + +/* 3 parameters, no fixup version */ +static int print_f3(struct sip_msg* msg, char* s1, char* s2, char* s3) +{ + printf("%s%s%s\n", s1, s2, s3); + return 1; +} + + +/* variable number of parameters, no fixup version */ +static int print_f_var(struct sip_msg* msg, int argc, action_u_t argv[]) +{ + int i; + for (i = 0; i < argc; i++) + printf("%s", argv[i].u.string); + printf("\n"); + return 1; +}

14 years, 10 months

git:andrei/rve_f_params: app_python: update api calls: s/MODULE_T/ MODULE2_T

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: 950759d9592ed7acf1821b0d96513164bda95c73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=950759d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 15 20:16:01 2010 +0100 app_python: update api calls: s/MODULE_T/MODULE2_T MODULE_T was obsoleted by recent core changes. It was replaced by MODULE0_T, MODULE1_T and MODULE2_T --- modules/app_python/python_msgobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/app_python/python_msgobj.c b/modules/app_python/python_msgobj.c index 0299228..830cfdb 100644 --- a/modules/app_python/python_msgobj.c +++ b/modules/app_python/python_msgobj.c @@ -219,7 +219,7 @@ msg_call_function(msgobject *self, PyObject *args) return Py_None; } - act = mk_action(MODULE_T, 4 /* number of (type, value) pairs */, + act = mk_action(MODULE2_T, 4 /* number of (type, value) pairs */, MODEXP_ST, fexport, /* function */ NUMBER_ST, 2, /* parameter number */ STRING_ST, arg1, /* param. 1 */

14 years, 10 months

git:andrei/rve_f_params: core: support for expressions/ variables in function parameters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: cad98b04136d6d48668b4b5c564ccaebd9b001f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cad98b0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 15 20:05:49 2010 +0100 core: support for expressions/variables in function parameters - all module functions that do not have fixups can now be called with variables, avps or expressions. They will be converted to string, either on startup (if the expression is constant, e.g. "a"+"b") or at runtime (if the expression is not constant, .e.g. $a, $b+$var(foo)+"test"). E.g.: f("1+1=" + 1 + 1, "v=" + $v). - slightly faster module function calls (eliminated some never-triggered sanity tests). --- action.c | 284 ++++++++++++++++++++++++++++++++++++++++++-------------- cfg.y | 183 ++++++++++++++++++++++++++++--------- route.c | 84 ++++++++++++++++- route_struct.c | 11 ++- route_struct.h | 7 +- 5 files changed, 448 insertions(+), 121 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cad…

14 years, 10 months

git:andrei/cancel_reason: tm: improved Reason support for E2E CANCELs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: c96405e48681e2f7a9945c3ff8533ef7dcd703f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c96405e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Mar 13 14:13:40 2010 +0100 tm: improved Reason support for E2E CANCELs When generating CANCELs on-the-fly as response to a received provisional reply on a branch of an E2E CANCELed transaction, remember the Reason(s) from the original E2E CANCEL. Up until now, the Reason was not remembered for branches where no provisional replies were received (on these branches no CANCEL is sent, unless cancel_b_method is set to 2 or at a later point a provisional reply arrives). Now each time an E2E CANCEL is received the Reason headers are saved inside the INVITE transaction, for possible use in later branch CANCEL generation (triggered by receiving a provisional reply). --- modules/tm/h_table.c | 2 + modules/tm/h_table.h | 2 + modules/tm/t_fwd.c | 123 +++++++++++++++++++++++++++++++++++++++++++-- modules/tm/t_msgbuilder.c | 22 +++++--- modules/tm/t_reply.c | 22 +++++--- modules/tm/t_reply.h | 12 ++++- 6 files changed, 160 insertions(+), 23 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c96…

14 years, 10 months

git:andrei/cancel_reason: tm: fix Reason generation for on-the-fly branch CANCELs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/cancel_reason Commit: e85232164c11ad4189861b499e08358c99174e5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e852321… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 8 22:54:55 2010 +0100 tm: fix Reason generation for on-the-fly branch CANCELs For a canceled transaction, branches that have not received any reply might not have any pre-generated cancel buffers (in case cancel_b_method!=2). This could also happen when the first provisional response on a branch arrives in the same time with the event triggering the cancel (e.g. 2xx or 6xx on another branch, e2e cancel or timeout). In this cases, when generating the per-branch CANCEL for the first time (triggered by a received provisional reply), use the final transaction reply code as Reason. Note that this covers only the final reply triggered CANCEL case (2xx or 6xx received, local timeout or local script t_reply()) and it does not cover the e2e CANCEL case, for which either no reason will be generated (cancel_b_method == 1) or the reason might be 487 (cancel_b_method==0). --- modules/tm/t_msgbuilder.c | 2 ++ modules/tm/t_reply.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index a05fdbc..91a82f0 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -171,6 +171,7 @@ char *build_local(struct cell *Trans,unsigned int branch, *len+=CONTENT_LENGTH_LEN+1 + CRLF_LEN; reason_len = 0; reas1 = 0; + reas_last = 0; /* compute reason size (if no reason or disabled => reason_len == 0)*/ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ if (likely(reason->cause > 0 && @@ -307,6 +308,7 @@ char *build_local_reparse(struct cell *Trans,unsigned int branch, reason_len = 0; reas1 = 0; + reas_last = 0; /* compute reason size (if no reason or disabled => reason_len == 0)*/ if (reason && reason->cause != CANCEL_REAS_UNKNOWN){ if (likely(reason->cause > 0 && diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 6ee3fae..6bcef61 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2043,8 +2043,14 @@ int reply_received( struct sip_msg *p_msg ) DBG("tm: reply_received: branch CANCEL created\n"); /* note that in this case we do not know the reason (it could be a final reply or a received cancel) - and we don't want to wait for it => no reason */ - cancel_branch(t, branch, 0, F_CANCEL_B_FORCE_C); + and we don't want to wait for it. However if + t->uas.status >= 200 it's probably due to a received + 2xx, 6xx, local timeout or a local final reply + (via t_reply()), so use t->uas.status as reason */ + cancel_data.reason.cause = (t->uas.status>=200)?t->uas.status: + CANCEL_REAS_UNKNOWN; + cancel_branch(t, branch, &cancel_data.reason, + F_CANCEL_B_FORCE_C); } goto done; /* nothing to do */ }

14 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev