sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/tcp_tls_changes: tls: removed handshake_timeout and send_timeout

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 3def48dce7f30f0fea37a4515922699b88c981b4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3def48d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu May 27 19:48:02 2010 +0200 tls: removed handshake_timeout and send_timeout Removed the handshake_timeout and send_timeout parameters. The values from tcp are used instead (tcp_connect_timeout and tcp_send_timeout). --- modules/tls/tls_mod.c | 3 --- modules/tls/tls_mod.h | 2 -- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index d545b31..7595684 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -172,7 +172,6 @@ tls_domain_t cli_defaults = { static str tls_method = STR_STATIC_INIT("TLSv1"); -int tls_handshake_timeout = 30; int tls_send_timeout = 30; int tls_con_lifetime = 600; /* this value will be adjusted to ticks later */ int tls_log = 3; @@ -239,8 +238,6 @@ static param_export_t params[] = { {"ca_list", PARAM_STR, &mod_params.ca_file }, {"certificate", PARAM_STR, &mod_params.cert_file }, {"cipher_list", PARAM_STR, &mod_params.cipher_list }, - {"handshake_timeout", PARAM_INT, &tls_handshake_timeout }, - {"send_timeout", PARAM_INT, &tls_send_timeout }, {"connection_timeout", PARAM_INT, &tls_con_lifetime }, {"tls_log", PARAM_INT, &tls_log }, {"session_cache", PARAM_INT, &tls_session_cache }, diff --git a/modules/tls/tls_mod.h b/modules/tls/tls_mod.h index ccadae0..19366ba 100644 --- a/modules/tls/tls_mod.h +++ b/modules/tls/tls_mod.h @@ -43,8 +43,6 @@ #include "../../locking.h" #include "tls_domain.h" -extern int tls_handshake_timeout; -extern int tls_send_timeout; extern int tls_con_lifetime; extern int tls_log; extern int tls_session_cache;

14 years, 8 months

kamailio 3.0.2 for Thu, May 27, 2010

by Daniel-Constantin Mierla

Hello, I am planning to release kamailio 3.0.2 this Thursday. There were some fixes since 3.0.1 that worth to be packaged. If you have major reports for current stable version, please write to sr-dev(a)lists.sip-router.org Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Miami, Fl, USA - June 21-23, 2010 http://www.asipto.com/index.php/kamailio-advanced-training/

14 years, 8 months

appending a new branch in route block

by Juha Heinanen

if t_relay() fails in route block so that failure route is not executed, is request uri "consumed" so that if a new branch is added by in the route block, that branch will be the only remaining one? in the test that i made, two lcr gws match the request uri. in route block i have: load_gws(); next_gw(); /* sets request-uri to uri of first gw */ while ($true) { t_on_branch("BRANCHES"); if (t_relay()) { xlog("Relaying succeeded with result $rc\n"); exit; } else { xlog("Relaying failed with result $rc\n"); }; if (!next_gw()) { /* tries to append the next gw as a new branch */ xlog("L_WARN", "No more gws\n"); send_reply("503", "Service not available"); exit; }; xlog("found next gw <$ds>\n") }; and in branch route block BRANCHES i have branch_route [BRANCHES] { xlog("L_INFO", "Relaying $rm <$ru>\n"); return; }; when proxy receives a request, i get to syslog (some lcr DBGs are changed to INFOs): May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: INFO: lcr [lcr_mod.c:1532]: added gw_uri_avp <1|1|00||lohi.tutpro.com|5060||1|4096> with weight <8192865> May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: INFO: lcr [lcr_mod.c:1532]: added gw_uri_avp <1|1|00||sars.tutpro.com|||2|64> with weight <3725453> May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: INFO: Relaying INVITE <sip:00358407058055@sars.tutpro.com;transport=tcp> May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: tm [ut.h:295]: ERROR: uri2dst: failed to resolve "sars.tutpro.com" :unresolvable A or AAAA request (-7) May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: tm [t_fwd.c:1391]: ERROR: t_forward_nonack: failure to add branches May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: Relaying failed with result -478 May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: INFO: lcr [lcr_mod.c:1949]: appending branch <sip:00358407058055@lohi.tutpro.com:5060> May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: found next gw <Contact: sip:00358407058055@sars.tutpro.com;transport=tcp, sip:00358407058055@lohi.tutpro.com:5060> May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: tm [ut.h:295]: ERROR: uri2dst: failed to resolve "sars.tutpro.com" :unresolvable A or AAAA request (-7) May 16 15:58:49 localhost /usr/sbin/sip-proxy[11412]: ERROR: Relaying succeeded with result 1 May 16 15:58:54 localhost /usr/sbin/sip-proxy[11459]: WARNING: No more gws the first gw domain name sars.tutpro.com does not exist and the tm errors are as they should. then next_gw() appends a new branch, but based on the "found next gw" log message it looks like sars.tutpro.com is still in the destination set. is this how it is supposed to be? if so, looks like i there is a bug in next_gw() in that it should clear the previous branch before adding a new one in case the previous branch was not consumed by t_relay? another strange thing is, why the branch route is executed only once (for the first t_relay) although the script is calling t_relay() two times and t_on_branch() is called before each call? -- juha

14 years, 8 months

git:master: Merge remote branch 'origin/tmp/ruri_branch'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 9b0c1a0e1f02d84c312d67cdc71360d5612b9e2c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b0c1a0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri May 28 13:30:38 2010 +0200 Merge remote branch 'origin/tmp/ruri_branch' * origin/tmp/ruri_branch: modules*: mark r-uri as "new" when changed tm: failure route start with r-uri marked as "consumed" tm: use ruri for forking only if marked as "new" core: mark uri as new on new message or seturi() core: support for marking a "consumed" r-uri ---

14 years, 8 months

git:master: xcap_server: relaxed detection of auid type from path

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d646b4b1c746bc36d7765d3fa15779b581c576d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d646b4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 28 12:51:43 2010 +0200 xcap_server: relaxed detection of auid type from path --- modules_k/xcap_server/xcap_server.c | 49 ++++++++++++++++++++++------------- 1 files changed, 31 insertions(+), 18 deletions(-) diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index c29ed98..06b8ae9 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -60,7 +60,7 @@ static int mod_init(void); static int child_init(int rank); static void destroy(void); -int xcaps_get_auid_type(str *path); +int xcaps_path_get_auid_type(str *path); int xcaps_generate_etag_hdr(str *etag); static str xcaps_db_table = str_init("xcap"); @@ -416,7 +416,7 @@ static int w_xcaps_put(sip_msg_t* msg, char* puri, char* ppath, goto error; } - dtype = xcaps_get_auid_type(&path); + dtype = xcaps_path_get_auid_type(&path); if(dtype==-1) { @@ -770,9 +770,13 @@ error: /** * */ -int xcaps_get_auid_type(str *path) +int xcaps_path_get_auid_type(str *path) { str s; + char c; + int ret; + + ret = -1; if(path==NULL) return -1; if(path->len<xcaps_root.len) @@ -784,38 +788,47 @@ int xcaps_get_auid_type(str *path) return -1; } - s.s = path->s + xcaps_root.len; - s.len = path->len - xcaps_root.len; + s.s = path->s + xcaps_root.len - 1; + s.len = path->len - xcaps_root.len + 1; + + c = s.s[s.len]; + s.s[s.len] = '\0'; - if(s.len>10 && s.s[10]=='/' - && strncmp(s.s, "pres-rules", 10)==0) + if(s.len>12 + && strstr(s.s, "/pres-rules/")!=NULL) { LM_DBG("matched pres-rules\n"); - return PRES_RULES; + ret = PRES_RULES; + goto done; } - if(s.len>12 && s.s[12]=='/' - && strncmp(s.s, "rls-services", 12)==0) + if(s.len>14 + && strstr(s.s, "/rls-services/")!=NULL) { LM_DBG("matched rls-services\n"); - return RLS_SERVICE; + ret = RLS_SERVICE; + goto done; } - if(s.len>17 && s.s[17]=='/' - && strncmp(s.s, "pidf-manipulation", 17)==0) + if(s.len>19 + && strstr(s.s, "pidf-manipulation")!=NULL) { LM_DBG("matched pidf-manipulation\n"); - return PIDF_MANIPULATION; + ret = PIDF_MANIPULATION; + goto done; } - if(s.len>14 && s.s[14]=='/' - && strncmp(s.s, "resource-lists", 14)==0) + if(s.len>16 + && strstr(s.s, "/resource-lists/")!=NULL) { LM_DBG("matched resource-lists\n"); - return RESOURCE_LIST; + ret = RESOURCE_LIST; + goto done; } - return -1; +done: + s.s[s.len] = c; + return ret; } /**

14 years, 8 months

new feature: embedded http 1.0 server

by Daniel-Constantin Mierla

Hello, there is a new module named xhttp which provides an embedded http server inside the SIP server. It reuses the transport layer from the core, so you can send http requests via TCP and TLS. The port is the same as for SIP traffic. The documentation of the module is available at: http://sip-router.org/docbook/sip-router/branch/master/modules/xhttp/xhttp.… Since sip and http are very similar, you can use other modules in handling the http requests. For example, you can do www-authentication: event_route[xhttp:request] { if (!www_authorize("xcap", "subscriber")) { www_challenge("sip-router.org", "0"); exit; } xhttp_reply("200", "OK", "text/html", "<html><body>Welcome $au, you are connected from $si:$sp</body></html>"); } allowing in this way only local SIP users to do http requests. For now supports only http 1.0, meaning it cannot take chunked requests (usually happening in PUT requests with large body). Hope it is useful for some of you. Its main goal right now is to offer the transport layer for embedded xcap server (the new xcap_server module), but it can be used for service monitoring, server control, etc. Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Miami, Fl, USA - June 21-23, 2010 http://www.asipto.com/index.php/kamailio-advanced-training/

14 years, 8 months

Kamailio v3.0.2 Released

by Daniel-Constantin Mierla

Hello, Kamailio v3.0.2 was just released. It is a patch release that includes the fixes done since release of v3.0.1. You should consider to upgrade if you run v3.0.0 or or v3.0.2, there is no change that you should do to configuration file or database, just reinstall the binaries. Source tarballs are available at: http://www.kamailio.org/pub/kamailio/3.0.2/src/ Detailed changelog: http://www.kamailio.org/pub/kamailio/3.0.2/ChangeLog Download via GIT: # git clone –depth 1 git://git.sip-router.org/sip-router kamailio # cd kamailio # git checkout -b kamailio_3.0 origin/kamailio_3.0 Binaries and packages will be uploaded at : http://www.kamailio.org/pub/kamailio/3.0.2/ Modules’ documentation: http://www.kamailio.org/docs/modules/3.0.x/ What is new in 3.0.x release series is summarized in the announcement of v3.0.0: http://www.kamailio.org/w/kamailio-openser-v3.0.0-release-notes/ If you are eager to see what's up to next major release (3.1.0), visit: http://sip-router.org/wiki/features/new-in-devel Enjoy, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

14 years, 8 months

git:kamailio_3.0: tls: fixed usage of error label

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 81280e02fe83b534b37de1c156e272b9f7d64f99 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81280e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 19:42:16 2010 +0200 tls: fixed usage of error label - introduced in previous commit --- modules/tls/tls_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 775faeb..39be2af 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -341,7 +341,7 @@ static int mod_init(void) /* register the rpc interface */ if (rpc_register_array(tls_rpc)!=0) { LOG(L_ERR, "failed to register RPC commands\n"); - goto error; + return -1; } /* if (init_tls() < 0) return -1; */

14 years, 8 months

git:kamailio_3.0: changelog updated for 3.0.2

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: ef1318beaac045b6fda524184c40041d2a3effe5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef1318b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 27 19:06:40 2010 +0200 changelog updated for 3.0.2 --- ChangeLog | 573 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 573 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ef1…

14 years, 8 months

git:master: tm: support for changing the reply status in the script

by Miklos Tirpak

Module: sip-router Branch: master Commit: 4cca625ce8229c5513451d135c09d9701c80dcd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4cca625… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed May 26 11:31:51 2010 +0200 tm: support for changing the reply status in the script The reply status code is re-read after the onreply_route block is executed which makes possile to change the status code from the script. The status code shall be rewritten directly in the message buffer and in the parsed structure, and the class of provisional and positive final replies cannot be changed. --- modules/tm/t_reply.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 9ad1d0e..2e6fd55 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2129,6 +2129,17 @@ int reply_received( struct sip_msg *p_msg ) stop_rb_timers(&uac->request); } #endif /* TM_ONREPLY_FINAL_DROP_OK */ + /* Re-read the status code, it can be changed in the route block. */ +#ifdef EXTRA_DEBUG + /* The class of provisional and positive final replies cannot be changed. */ + if (((msg_status < 300) || (p_msg->REPLY_STATUS < 300)) + && (msg_status/100 != p_msg->REPLY_STATUS/100) + ) { + LOG(L_ERR, "ERROR: The class of provisional and " + "positive final replies should not be changed!\n"); + } +#endif /* EXTRA_DEBUG */ + msg_status=p_msg->REPLY_STATUS; } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */

14 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev