sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:master: sctp: add module interface for sctp transport

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d60d41136575408ea7ea9031c735476967755e46 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d60d411… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 10:54:33 2013 +0200 sctp: add module interface for sctp transport - sctp support is now implemented as a standalone module - the core still needs SCTP=1 (now default) and -DUSE_SCTP to get the hooks enabled --- modules/sctp/Makefile | 16 ++++ modules/sctp/sctp_ev.h | 2 +- modules/sctp/sctp_mod.c | 78 +++++++++++++++++++ modules/sctp/sctp_options.c | 8 +- modules/sctp/sctp_rpc.c | 175 +++++++++++++++++++++++++++++++++++++++++++ modules/sctp/sctp_rpc.h | 24 ++++++ modules/sctp/sctp_server.c | 26 ++++--- modules/sctp/sctp_server.h | 2 +- modules/sctp/sctp_stats.c | 3 +- modules/sctp/sctp_stats.h | 2 +- 10 files changed, 317 insertions(+), 19 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d60…

11 years, 5 months

git:master: core: added file sctp core interface

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f91c9696cc92ec4b74dd2494c39bbf2ffe062fab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f91c969… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 09:35:22 2013 +0200 core: added file sctp core interface --- sctp_core.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sctp_core.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/sctp_core.c b/sctp_core.c new file mode 100644 index 0000000..863d578 --- /dev/null +++ b/sctp_core.c @@ -0,0 +1,59 @@ +/** + * $Id$ + * + * Copyright (C) 2013 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "sctp_core.h" + +int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len) +{ + return 0; +} + +void sctp_core_destroy(void) +{ +} + +int sctp_core_init_sock(struct socket_info* sock_info) +{ + return 0; +} + +int sctp_core_rcv_loop(void) +{ + return 0; +} + +void sctp_core_init_options(void) +{ +} + +int sctp_core_check_compiled_sockopts(char* buf, int size) +{ + return 0; +} + +int sctp_core_check_support(void) +{ + return 0; +} + +int sctp_core_init(void) +{ + return 0; +} diff --git a/sctp_core.h b/sctp_core.h new file mode 100644 index 0000000..4e113c4 --- /dev/null +++ b/sctp_core.h @@ -0,0 +1,42 @@ +/** + * $Id$ + * + * Copyright (C) 2013 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef __sctp_core_h__ +#define __sctp_core_h__ + +#include "ip_addr.h" + +int sctp_core_init(void); + +void sctp_core_destroy(void); + +int sctp_core_init_sock(struct socket_info* sock_info); + +void sctp_core_init_options(void); + +int sctp_core_check_compiled_sockopts(char* buf, int size); + +int sctp_core_check_support(void); + +int sctp_core_rcv_loop(void); + +int sctp_core_msg_send(struct dest_info* dst, char* buf, unsigned len); + +#endif

11 years, 5 months

git:master: Makefile.defs: don't link to libsctp on Linux for SCTP support

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: af2473d426870650a0f4a2cb820894ee4dd793d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af2473d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 10:53:04 2013 +0200 Makefile.defs: don't link to libsctp on Linux for SCTP support - only sctp module needs to link to it --- Makefile.defs | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 5381a8a..b5fe3bb 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1807,7 +1807,8 @@ $(info "sctp libraries not installed -- sctp disabled") ifeq ($(SCTP),1) # use lksctp C_DEFS+=-DUSE_SCTP - LIBS+=-lsctp + # link to libsctp is needed only for sctp module + # LIBS+=-lsctp endif endif # SCTP endif

11 years, 5 months

git:master: sctp: new module for SCTP transport

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7f8e7a8568740be65eada1cbd59110bb765f4d5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f8e7a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 25 09:33:39 2013 +0200 sctp: new module for SCTP transport - moved the sctp specific code from core to a module to make it easy to enable/disable sctp by loading/not loading the module instead of recompiling --- Makefile.defs | 2 + action.c | 2 +- cfg.lex | 57 ------- cfg.y | 182 +---------------------- core_cmd.c | 134 ----------------- forward.h | 4 +- main.c | 23 +-- sctp_ev.h => modules/sctp/sctp_ev.h | 0 sctp_options.c => modules/sctp/sctp_options.c | 0 sctp_options.h => modules/sctp/sctp_options.h | 0 sctp_server.c => modules/sctp/sctp_server.c | 0 sctp_server.h => modules/sctp/sctp_server.h | 0 sctp_sockopts.h => modules/sctp/sctp_sockopts.h | 0 sctp_stats.c => modules/sctp/sctp_stats.c | 0 sctp_stats.h => modules/sctp/sctp_stats.h | 0 15 files changed, 14 insertions(+), 390 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7f8…

11 years, 5 months

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Juha Heinanen (jh) ---------- unfortunately i need to reopen this task. i started to do more tests and and branch failure route execution is not deterministic. closer examination of daniel's test output showed that branch failure router was not executed in that test either. attached is complete test config. i use sipsak to send request to it like this: sipsak -s sip:foo@127.0.0.1:5060 first time i got: May 25 14:21:23 siika sip-proxy[6697]: ERROR: <script>: ===== main route block May 25 14:21:23 siika sip-proxy[6697]: ERROR: <script>: ===== after t_newtrans() May 25 14:21:23 siika sip-proxy[6697]: ERROR: tm [../../forward.h:216]: msg_send(): msg_send: ERROR: tcp_send failed May 25 14:21:23 siika sip-proxy[6697]: ERROR: tm [t_fwd.c:1592]: t_send_branch(): ERROR: t_send_branch: sending request on branch 0 failed May 25 14:21:23 siika sip-proxy[6697]: ERROR: tm [t_fwd.c:1595]: t_send_branch(): putting branch 0 on hold May 25 14:21:23 siika sip-proxy[6697]: ERROR: <script>: ===== t relay return code: 1 May 25 14:21:23 siika sip-proxy[6696]: ERROR: <script>: ===== main route block May 25 14:21:24 siika sip-proxy[6698]: ERROR: <script>: ===== main route block May 25 14:21:26 siika sip-proxy[6695]: ERROR: <script>: ===== main route block May 25 14:21:28 siika sip-proxy[6708]: ERROR: <script>: ==== failure route block that is, branch failure block was not executed. second time 20 sec later i got: May 25 14:21:44 siika sip-proxy[6694]: ERROR: <script>: ===== main route block May 25 14:21:44 siika sip-proxy[6694]: ERROR: <script>: ===== after t_newtrans() May 25 14:21:44 siika sip-proxy[6694]: ERROR: tm [../../forward.h:216]: msg_send(): msg_send: ERROR: tcp_send failed May 25 14:21:44 siika sip-proxy[6694]: ERROR: tm [t_fwd.c:1592]: t_send_branch(): ERROR: t_send_branch: sending request on branch 0 failed May 25 14:21:44 siika sip-proxy[6694]: ERROR: tm [t_fwd.c:1595]: t_send_branch(): putting branch 0 on hold May 25 14:21:44 siika sip-proxy[6694]: ERROR: <script>: ===== t relay return code: 1 May 25 14:21:45 siika sip-proxy[6693]: ERROR: <script>: ===== main route block May 25 14:21:46 siika sip-proxy[6692]: ERROR: <script>: ===== main route block May 25 14:21:48 siika sip-proxy[6691]: ERROR: <script>: ===== main route block May 25 14:21:49 siika sip-proxy[6708]: ERROR: <script>: ==== branch failure route block May 25 14:21:49 siika sip-proxy[6708]: ERROR: <script>: ==== failure route block that is, branch failure route block was executed. -- juha complete config used in test: loadmodule "pv" loadmodule "xlog" modparam("tm", "fr_timer", 5000) modparam("tm", "local_ack_mode", 2) modparam("tm", "failure_reply_mode", 3) modparam("tm", "failure_exec_mode", 1) route { xlog("===== main route block\n"); t_newtran(); xlog("===== after t_newtrans()\n"); $ru = "sip:foo@127.0.0.1:9;transport=tcp"; t_on_failure("x"); t_on_branch_failure("x"); set_forward_no_connect(); t_relay(); $var(rc) = $rc; xlog("===== t relay return code: $rc\n"); exit; } failure_route[x] { xlog("==== failure route block\n"); exit; } event_route[tm:branch-failure:x] { xlog("==== branch failure route block\n"); } ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=296#comment892 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.

11 years, 5 months

[tracker] Task reopened: tm:branch-failure event_route is not executed on all branch failures

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been re-opened: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Juha Heinanen (jh) More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=296 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.

11 years, 5 months

git:master: core: remove syn_branch functionality for calculating Via branch parameter

by Henning Westerholt

Module: sip-router Branch: master Commit: 6287caecc438ace98a3ce3dc7a53e6064d7894dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6287cae… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Fri May 24 15:38:03 2013 +0200 core: remove syn_branch functionality for calculating Via branch parameter * remove syn_branch parameter and functionality from core and tm module for calculating the Via branch parameter * reported from Richard Brady, rnbrady at gmail dot com to sr-dev * kamailio is not standard compliant with this setting enabled (RFC 3261, 17.2.3 and 16.11) for stateless forwarding of replies * the performance reason that motivated this functionality are today not valid anymore, even embedded systems have more than enough power to calculate MD5 and other modules uses more expensive operations anyway * adapt a bunch of example and test configuration that used this parameter, it has been also removed from the core cookbook wiki --- cfg.lex | 2 - cfg.y | 3 -- examples/pcscf/kamailio.cfg | 1 - examples/websocket.cfg | 2 - forward.c | 32 +++++++++---------------- globals.h | 1 - main.c | 2 - modules/tm/h_table.c | 45 +++++++++++++++++------------------- modules/tm/h_table.h | 4 +- modules/tm/t_lookup.c | 53 +++++++++--------------------------------- modules/tm/t_msgbuilder.c | 6 +---- test/sf.cfg | 1 - test/stress.cfg | 1 - test/tcp.cfg | 1 - 14 files changed, 48 insertions(+), 106 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=628…

11 years, 5 months

"SER Getting Started" - what's the copyright and license?

by Olle E. Johansson

http://kamailio.org/docs/ser-getting-started/SER-GettingStarted.pdf I'm looking for the authors of this document to find out what license it is published under. It would be nice to be able to use it and update it instead of starting a new "getting started" from scratch. Please contact me if you get this message! Sorry for cross-posting. /O

11 years, 5 months

git:master: pv: added $_s(format) variable

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 28942a00bc7be5194625b9ed08facd2f95ebea81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28942a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 24 00:36:57 2013 +0200 pv: added $_s(format) variable - evaluate the format as a dynamic string $var(x) = "sip:" + $rU + "@" + $fd; is equivalent of: $var(x) = $_s(sip:$rU@$fd); - it can be more compact sometimes in config --- modules/pv/pv.c | 2 ++ modules/pv/pv_core.c | 41 +++++++++++++++++++++++++++++++++++++++++ modules/pv/pv_core.h | 5 +++++ 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 44d35e0..fcfea11 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -63,6 +63,8 @@ static tr_export_t mod_trans[] = { }; static pv_export_t mod_pvs[] = { + { {"_s", (sizeof("_s")-1)}, PVT_OTHER, pv_get__s, 0, + pv_parse__s_name, 0, 0, 0 }, { {"af", (sizeof("af")-1)}, PVT_OTHER, pv_get_af, 0, pv_parse_af_name, 0, 0, 0 }, { {"branch", sizeof("branch")-1}, /* branch attributes */ diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 4225f21..1b5a1f5 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -2898,3 +2898,44 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, AF_INET); } } + +/** + * + */ +int pv_parse__s_name(pv_spec_p sp, str *in) +{ + pv_elem_t *fmt = NULL; + + if(in->s==NULL || in->len<=0) + return -1; + if(pv_parse_format(in, &fmt)<0 || fmt==NULL) + { + LM_ERR("wrong format[%.*s]\n", in->len, in->s); + return -1; + } + sp->pvp.pvn.u.dname = (void*)fmt; + sp->pvp.pvn.type = PV_NAME_OTHER; + return 0; +} + +/** + * + */ +int pv_get__s(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + str sdata = {0}; + pv_elem_t *fmt = NULL; + fmt = (pv_elem_t*)param->pvn.u.dname; + + if(fmt==NULL) + { + return pv_get_null(msg, param, res); + } + if(pv_printf_s(msg, fmt, &sdata)!=0) + { + LM_ERR("cannot evaluate the string\n"); + return -1; + } + return pv_get_strval(msg, param, res, &sdata); +} diff --git a/modules/pv/pv_core.h b/modules/pv/pv_core.h index 193185b..83eac5a 100644 --- a/modules/pv/pv_core.h +++ b/modules/pv/pv_core.h @@ -315,5 +315,10 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, int pv_parse_flag_param(pv_spec_p sp, str *in); +int pv_parse__s_name(pv_spec_p sp, str *in); + +int pv_get__s(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + #endif

11 years, 5 months

git:4.0: auth: add chapter tag around sections for Admin Guide

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: b5f362f4ddbc932daad611996d3e9abf2d91cd12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5f362f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 23 12:06:45 2013 +0200 auth: add chapter tag around sections for Admin Guide - the ToC isn't properly generated otherwise - reported by Andrew Pogrebennyk (cherry picked from commit 76c883eb88359f6075712f648a1dfc675872487a) --- modules/auth/doc/auth.xml | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/auth/doc/auth.xml b/modules/auth/doc/auth.xml index b3e0c98..9cecafa 100644 --- a/modules/auth/doc/auth.xml +++ b/modules/auth/doc/auth.xml @@ -39,10 +39,12 @@ <holder>FhG FOKUS</holder> </copyright> - <toc></toc> </bookinfo> + <toc></toc> - + + <chapter> + <title>Admin Guide</title> <section id="auth.overview"> <title>Overview</title> <para> @@ -71,4 +73,5 @@ <xi:include href="auth_params.xml"/> <xi:include href="auth_functions.xml"/> + </chapter> </book>

11 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013