sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
227 discussions

git:master: core: small spelling fix in log message
by Henning Westerholt 28 Jan '11

28 Jan '11

Module: sip-router Branch: master Commit: 536e5901c83b4c9b8d6aff7dd32e2fe0fefe6d0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=536e590… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Jan 28 15:29:45 2011 +0100 core: small spelling fix in log message --- lvalue.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index bce987f..e13e1a5 100644 --- a/lvalue.c +++ b/lvalue.c @@ -406,7 +406,7 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, break; } if (unlikely(ret<0)){ - ERR("assignmet failed at pos: (%d,%d-%d,%d)\n", + ERR("assignment failed at pos: (%d,%d-%d,%d)\n", rve->fpos.s_line, rve->fpos.s_col, rve->fpos.e_line, rve->fpos.e_col); }

1 0

git:master: core: print cfg line for failed eval expressions
by Daniel-Constantin Mierla 27 Jan '11

27 Jan '11

Module: sip-router Branch: master Commit: bf7cacc549e18d483a892c208cd27c9263b86c49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf7cacc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jan 28 00:02:47 2011 +0100 core: print cfg line for failed eval expressions --- lvalue.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/lvalue.c b/lvalue.c index a8dcbd9..bce987f 100644 --- a/lvalue.c +++ b/lvalue.c @@ -395,7 +395,8 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, } switch(lv->type){ case LV_NONE: - BUG("uninitialized/invalid lvalue (%d)\n", lv->type); + BUG("uninitialized/invalid lvalue (%d) (cfg line: %d)\n", + lv->type, rve->fpos.s_line); goto error; case LV_AVP: ret=lval_avp_assign(h, msg, lv, rv); @@ -404,6 +405,11 @@ int lval_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=lval_pvar_assign(h, msg, lv, rv); break; } + if (unlikely(ret<0)){ + ERR("assignmet failed at pos: (%d,%d-%d,%d)\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + } rval_destroy(rv); return ret; error:

1 0

git:master: sanity: print broken uri if failed to parse
by Daniel-Constantin Mierla 27 Jan '11

27 Jan '11

Module: sip-router Branch: master Commit: f3217b68093f82da411b6870eaabeaba9e229e0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3217b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 27 21:33:13 2011 +0100 sanity: print broken uri if failed to parse --- modules/sanity/sanity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/sanity/sanity.c b/modules/sanity/sanity.c index c7cc41b..e60a28c 100644 --- a/modules/sanity/sanity.c +++ b/modules/sanity/sanity.c @@ -218,7 +218,8 @@ int check_ruri_scheme(struct sip_msg* _msg) { if (_msg->parsed_uri_ok == 0 && parse_sip_msg_uri(_msg) != 1) { /* unsupported schemes end up here already */ - LOG(L_WARN, "sanity_check(): check_ruri_scheme(): failed to parse request uri\n"); + LM_WARN("failed to parse request uri [%.*s]\n", + GET_RURI(_msg)->len, GET_RURI(_msg)->s); } if (_msg->parsed_uri.type == ERROR_URI_T) { if (_msg->REQ_METHOD != METHOD_ACK) {

1 0

git:carstenbock/ims: - Fixed some Regular Expressions
by Carsten Bock 27 Jan '11

27 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: e87da704cb62f71863dc7bb70f928ef0ac8ba61e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e87da70… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 27 19:25:46 2011 +0100 - Fixed some Regular Expressions --- modules/pcscf/pcscf.cfg | 98 +++++++++++++++++++++++++++++----------------- 1 files changed, 62 insertions(+), 36 deletions(-) diff --git a/modules/pcscf/pcscf.cfg b/modules/pcscf/pcscf.cfg index 0427216..9c78aa3 100644 --- a/modules/pcscf/pcscf.cfg +++ b/modules/pcscf/pcscf.cfg @@ -554,7 +554,8 @@ route[add_charging_vector] route[REGISTER] { #!ifndef WITH_EMERGENCY - if ($(ct{uri.params}{param.value,sos})) { + $var(ct_uri) = $(ct{re.subst,/\".*\"[ ]*//i}{re.subst,/<//i}{re.subst,/>//i}); + if ($(var(ct_uri){uri.params}{param.value,sos})) { # P_380_em_alternative_serv("no Emergency Services support at this PCSCF"); #TODO: Fix XML-Body set_reply_body("<xml>no Emergency Services support at this PCSCF</xml>", "application/3gpp-ims+xml;schemaversion=\"1\""); @@ -576,12 +577,11 @@ route[REGISTER] # break; #} remove_hf("Security-Client"); + # Set the "integrity protected tag in the Authorization-Header: - if (is_present_hf("Authorization")){ + if (is_present_hf("Authorization") && $hdr(Authorization) =~ ".*integrity-protected.*"){ remove_hf("Authorization"); - $var(new_hdr) = $(hdr(Authorization){re.subst,/,[ ]*integrity-protected=\"(a-zA-Z0-9)*\"//i}); - xlog("L_ERR", "$$var(new_hdr) = $var(new_hdr)\n"); - $var(new_hdr) = $hdr(Authorization); + $var(new_hdr) = $(hdr(Authorization){re.subst,/[, ]*integrity-protected=\"[a-zA-Z0-9]*\"//i}); append_hf("Authorization: $var(new_hdr), integrity-protected=\"no\"\r\n"); } }else{ @@ -593,30 +593,28 @@ route[REGISTER] remove_hf("Security-Client"); # Set the "integrity protected tag in the Authorization-Header: - if (is_present_hf("Authorization")){ + if (is_present_hf("Authorization") && $hdr(Authorization) =~ ".*integrity-protected.*"){ remove_hf("Authorization"); - $var(new_hdr) = $(hdr(Authorization){re.subst,/,[ ]*integrity-protected=\"(a-zA-Z0-9)*\"//i}); - xlog("L_ERR", "$$var(new_hdr) = $var(new_hdr)\n"); - $var(new_hdr) = $hdr(Authorization); + $var(new_hdr) = $(hdr(Authorization){re.subst,/[, ]*integrity-protected=\"[a-zA-Z0-9]*\"//i}); append_hf("Authorization: $var(new_hdr), integrity-protected=\"yes\"\r\n"); } }; # Check for "sec-agree" in the Require header: - if (is_present_hf("Require")) { + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Require: $var(new_hdr)\r\n"); } } # Check for "sec-agree" in the Proxy-Require header: - if (is_present_hf("Proxy-Require")) { + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Proxy-Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Proxy-Require: $var(new_hdr)\r\n"); } @@ -657,13 +655,23 @@ route[REGISTER] onreply_route[REGISTER_reply] { if (t_check_status("401")){ + xlog("L_ERR", "401:\n"); # Check for "sec-agree" in the Proxy-Require header: - if ($hdr(WWW-Authenticate)) { - # The new Require-Header: + if (is_present_hf("WWW-Authenticate") && ($hdr(WWW-Authenticate) =~ ".*ck=.*" || $hdr(WWW-Authenticate) =~ ".*ik=.*")) { + $var(new_hdr) = $hdr(WWW-Authenticate); + xlog("L_ERR", "$$var(new_hdr) = $var(new_hdr)\n"); + if ($var(new_hdr) =~ ".*ck=.*") { + # Replace ", (ck/ik)" with "" + $var(new_hdr) = $(var(new_hdr){re.subst,/[, ]*ck=\"[0-9A-Za-z]*\"//i}); + xlog("L_ERR", "CK: $$var(new_hdr) = $var(new_hdr)\n"); + } + if ($var(new_hdr) =~ ".*ik=.*") { + # Replace ", (ck/ik)" with "" + $var(new_hdr) = $(var(new_hdr){re.subst,/[, ]*ik=\"[0-9A-Za-z]*\"//i}); + xlog("L_ERR", "IK: $$var(new_hdr) = $var(new_hdr)\n"); + } + # Replace the header: remove_hf("WWW-Authenticate"); - # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(WWW-Authenticate){re.subst,/[, \r\n\t]*ck=\"(a-zA-Z0-9)*\"//gi}); - $var(new_hdr) = $(var(new_hdr){re.subst,/[, \r\n\t]*ik=\"(a-zA-Z0-9)*\"//gi}); append_hf("WWW-Authenticate: $var(new_hdr)\r\n"); } else { # send_reply("500","P-CSCF Error on hiding CK, IK"); @@ -732,21 +740,21 @@ route[Orig_Initial] P_record_route("orig"); # Check for "sec-agree" in the Require header: - if ($hdr(Require)) { + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//i}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Require: $var(new_hdr)\r\n"); } } # Check for "sec-agree" in the Proxy-Require header: - if ($hdr(Proxy-Require)) { + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Proxy-Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//i}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Proxy-Require: $var(new_hdr)\r\n"); } @@ -784,21 +792,21 @@ route[Orig_Initial_Emergency] P_record_route("orig"); # Check for "sec-agree" in the Require header: - if ($hdr(Require)) { + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Require: $var(new_hdr)\r\n"); } } # Check for "sec-agree" in the Proxy-Require header: - if ($hdr(Proxy-Require)) { + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Proxy-Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Proxy-Require: $var(new_hdr)\r\n"); } @@ -978,8 +986,26 @@ route[Orig_Subsequent] P_STR("orig"); } - P_remove_header_tag("Require","sec-agree"); - P_remove_header_tag("Proxy-Require","sec-agree"); + # Check for "sec-agree" in the Require header: + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { + # The new Require-Header: + remove_hf("Require"); + # Replace ", sec-agree" with "" + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//gi}); + if ($(var(new_hdr){s.len}) > 0) { + append_hf("Require: $var(new_hdr)\r\n"); + } + } + # Check for "sec-agree" in the Require header: + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { + # The new Require-Header: + remove_hf("Proxy-Require"); + # Replace ", sec-agree" with "" + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//gi}); + if ($(var(new_hdr){s.len}) > 0) { + append_hf("Proxy-Require: $var(new_hdr)\r\n"); + } + } P_remove_security_verify(); # reply routes unused as empty at the moment @@ -1047,21 +1073,21 @@ route[Orig_Standalone] # add IBCF/THIG route here if required # Check for "sec-agree" in the Require header: - if ($hdr(Require)) { + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Require: $var(new_hdr)\r\n"); } } # Check for "sec-agree" in the Proxy-Require header: - if ($hdr(Proxy-Require)) { + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Proxy-Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Proxy-Require: $var(new_hdr)\r\n"); } @@ -1207,21 +1233,21 @@ route[Term_Subsequent] } # Check for "sec-agree" in the Require header: - if ($hdr(Require)) { + if (is_present_hf("Require") && $hdr(Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Require: $var(new_hdr)\r\n"); } } # Check for "sec-agree" in the Proxy-Require header: - if ($hdr(Proxy-Require)) { + if (is_present_hf("Proxy-Require") && $hdr(Proxy-Require) =~ ".*sec-agree.*") { # The new Require-Header: remove_hf("Proxy-Require"); # Replace ", sec-agree" with "" - $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, \r\n\t]*sec-agree//gi}); + $var(new_hdr) = $(hdr(Proxy-Require){re.subst,/[, ]*sec-agree//gi}); if ($(var(new_hdr){s.len}) > 0) { append_hf("Proxy-Require: $var(new_hdr)\r\n"); }

1 0

[tracker] Comment added: UAC Outgoing Registration Failed Authentication
by sip-router 27 Jan '11

27 Jan '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#108 - UAC Outgoing Registration Failed Authentication User who did this - bernhards (bernhards) ---------- Hi, any new update for the failed registration on asterisk? Is it allowed to change the "Call-ID" in the REGISTER with authentication? Thanks in advance. Best regards, Bernhard ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=108#comment155 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.

1 0

git:carstenbock/ims: - Fixed NAT-Traversal
by Carsten Bock 27 Jan '11

27 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 90aab8f26a89bb3b23b9a0fd51065ade2be5f9e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90aab8f… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Jan 26 21:52:31 2011 +0100 - Fixed NAT-Traversal --- modules/pcscf/pcscf.cfg | 49 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 39 insertions(+), 10 deletions(-) diff --git a/modules/pcscf/pcscf.cfg b/modules/pcscf/pcscf.cfg index 320c293..104e2ac 100644 --- a/modules/pcscf/pcscf.cfg +++ b/modules/pcscf/pcscf.cfg @@ -77,6 +77,7 @@ #!ifdef WITH_NAT #!define INVITE_SDP_FLAG 3 #!endif +#!define NAT_FLAG 4 ####### Defined Values ######### @@ -87,7 +88,7 @@ debug=4 log_stderror=yes #!else -debug=2 +debug=1 log_stderror=no #!endif @@ -151,6 +152,7 @@ loadmodule "mi_fifo.so" loadmodule "pv.so" loadmodule "xlog.so" loadmodule "textops.so" +loadmodule "path.so" #!ifdef K_TESTING loadmodule "sst.so" loadmodule "dialog.so" @@ -178,6 +180,10 @@ loadmodule "xmlrpc.so" # ----- mi_fifo params ----- modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") +# ----------------- Settings for Path --------------- +# Path Module: the "received" parameter of the first Route URI is evaluated and used as destination-URI if present. +modparam("path", "use_received", 1) + # ----- dialog params ----- #!ifdef K_TESTING #!ifdef WITH_DB @@ -323,6 +329,8 @@ modparam("tls", "config", "/etc/kamailio/tls.cfg") # main routing logic route { + xlog("L_ERR", "$rm $ru (From $fu to $tu)\n"); + # Basic checks for Sanity of the request and Request flooding. route(Sanity_Checks); @@ -349,7 +357,8 @@ route { route(NOTIFY); break; } - + + xlog("L_ERR", "$$route_uri = $route_uri\n"); if !($route_uri =~ "sip:term@"+HOSTNAME_ESC+"."+NETWORKNAME_ESC+".*") { # Request Initiated by the UE #!ifdef K_TESTING @@ -399,7 +408,7 @@ route { #!ifdef K_TESTING if (!is_in_profile("term") && is_method("INVITE|SUBSCRIBE")){ #!else - if (P_is_in_dialog("term") && is_method("INVITE|SUBSCRIBE")){ + if (!P_is_in_dialog("term") && is_method("INVITE|SUBSCRIBE")){ #!endif route(Term_Initial); break; @@ -436,9 +445,9 @@ route[NAT] { #!ifdef WITH_NAT force_rport(); if (nat_uac_test("19")) { + setflag(NAT_FLAG); if (is_method("INVITE")) { fix_nated_contact(); - } } #!endif @@ -450,10 +459,10 @@ route[RTPPROXY] { #!ifdef WITH_NAT if (is_method("BYE")) { unforce_rtp_proxy(); - } else if (is_method("INVITE") && !search("^Content-Length:[ ]*0")) { + } else if (isflagset(NAT_FLAG) && is_method("INVITE") && !search("^Content-Length:[ ]*0")) { setflag(INVITE_SDP_FLAG); rtpproxy_offer(); - } else if (is_method("ACK") && !search("^Content-Length:[ ]*0")) { + } else if (isflagset(NAT_FLAG) && is_method("ACK") && !search("^Content-Length:[ ]*0")) { rtpproxy_answer(); } #!endif @@ -462,7 +471,7 @@ route[RTPPROXY] { route[RTPPROXY_REPLY] { #!ifdef WITH_NAT - if (status=~"(183)|(2[0-9][0-9])" && !search("^Content-Length:[ ]*0")) { + if (isflagset(NAT_FLAG) && status=~"(183)|(2[0-9][0-9])" && !search("^Content-Length:[ ]*0")) { if (isflagset(INVITE_SDP_FLAG)) rtpproxy_answer(); else rtpproxy_offer(); } @@ -613,7 +622,14 @@ route[REGISTER] } remove_hf("Security-Verify"); # Add a term path-Header: - append_hf("Path: <sip:term@"+HOSTNAME+"."+NETWORKNAME+";lr>\r\n"); + if (isflagset(NAT_FLAG)) { + if ($pr == "udp") + append_hf("Path: <sip:term@"+HOSTNAME+"."+NETWORKNAME+";lr;received=sip:$si:$sp>\r\n"); + else + append_hf("Path: <sip:term@"+HOSTNAME+"."+NETWORKNAME+";lr;received=sip:$si:$sp;transport=$pr>\r\n"); + } else + append_hf("Path: <sip:term@"+HOSTNAME+"."+NETWORKNAME+";lr>\r\n"); + append_hf("Require: path\r\n"); # Add a charging vector: route(add_charging_vector); @@ -690,6 +706,7 @@ route[NOTIFY] ####### ORIGINATING route[Orig_Initial] { + xlog("L_ERR", "route[Orig_Initial]\n"); if (P_emergency_ruri()){ route(Orig_Initial_Emergency); break; @@ -705,6 +722,7 @@ route[Orig_Initial] }; # add IBCF/THIG route here if required loose_route(); + xlog("L_ERR", "1) $$du = $du\n"); if (!P_follows_service_routes()){ #Variant 1 - deny access to the network #send_reply("400","Bad Request - Not following indicated Service-Routes"); @@ -712,8 +730,10 @@ route[Orig_Initial] #Variant 2 - enforce routes and let the dialog continue P_enforce_service_routes(); } + xlog("L_ERR", "2) $$du = $du\n"); P_record_route("orig"); + xlog("L_ERR", "3) $$du = $du\n"); # Check for "sec-agree" in the Require header: if ($hdr(Require)) { @@ -745,11 +765,14 @@ route[Orig_Initial] send_reply("514","Originating dialog save failure - P-CSCF maximum dialog count reached!"); exit; } - + xlog("L_ERR", "10) $$du = $du\n"); + if (is_method("INVITE")){ #P_local_policy(); #check, if sdp is allowed, if not return with allowed sdp + P_NAT_relay(); route(RTPPROXY); } + xlog("L_ERR", "11) $$du = $du\n"); t_on_reply("Orig_Initial_reply"); t_on_failure("Orig_Initial_failure"); @@ -1091,6 +1114,7 @@ failure_route[Orig_Standalone_failure] route[Term_Initial] { + xlog("L_ERR", "Term_Initial\n"); P_record_route("term"); @@ -1100,8 +1124,10 @@ route[Term_Initial] send_reply("514","Terminating dialog save failure - P-CSCF maximum dialog count reached!"); exit; } + xlog("L_ERR", "Route: $hdr(Route)\n"); loose_route(); + xlog("L_ERR", "1) $$du = $du\n"); t_on_reply("Term_Initial_reply"); #t_on_failure("Term_Initial_failure"); @@ -1110,6 +1136,8 @@ route[Term_Initial] } if (!P_security_relay()) P_NAT_relay(); + + xlog("L_ERR", "2) $$du = $du\n"); t_on_reply("Term_Initial_reply"); t_on_failure("Term_Initial_failure"); if (!t_relay()) { @@ -1117,7 +1145,6 @@ route[Term_Initial] P_drop_dialog("term"); break; }; - } @@ -1222,6 +1249,7 @@ route[Term_Subsequent] #t_on_failure("Term_Subsequent_failure"); if (!P_security_relay()) P_NAT_relay(); + xlog("L_ERR", "$$du = $du\n"); if (!t_relay()) { send_reply("500","Error forwarding terminating subsequent request"); break; @@ -1272,6 +1300,7 @@ route[Term_Standalone] #t_on_failure("Term_Standalone_failure"); if (!P_security_relay()) P_NAT_relay(); + xlog("L_ERR", "$$du = $du\n"); if (!t_relay()) { send_reply("500","Error forwarding terminating standalone request"); break;

1 0

git:carstenbock/ims: - more fixes to the configuration
by Carsten Bock 27 Jan '11

27 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: f98c79f1bb109460a9dfeee0fdd71093c6c3490c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f98c79f… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 27 09:04:13 2011 +0100 - more fixes to the configuration --- modules/pcscf/pcscf.cfg | 79 ++++++++++++++++++----------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/modules/pcscf/pcscf.cfg b/modules/pcscf/pcscf.cfg index 104e2ac..0427216 100644 --- a/modules/pcscf/pcscf.cfg +++ b/modules/pcscf/pcscf.cfg @@ -153,6 +153,7 @@ loadmodule "pv.so" loadmodule "xlog.so" loadmodule "textops.so" loadmodule "path.so" +loadmodule "siputils.so" #!ifdef K_TESTING loadmodule "sst.so" loadmodule "dialog.so" @@ -329,12 +330,11 @@ modparam("tls", "config", "/etc/kamailio/tls.cfg") # main routing logic route { - xlog("L_ERR", "$rm $ru (From $fu to $tu)\n"); + xlog("L_ERR", "$rm $ru (From $fu / $si)\n"); # Basic checks for Sanity of the request and Request flooding. route(Sanity_Checks); - # Add- # Thus P_check_via_sent_by/P_add_via_received is no longer required. route(NAT); @@ -358,13 +358,13 @@ route { break; } - xlog("L_ERR", "$$route_uri = $route_uri\n"); + xlog("L_ERR", "$$route_uri = $route_uri\n"); if !($route_uri =~ "sip:term@"+HOSTNAME_ESC+"."+NETWORKNAME_ESC+".*") { # Request Initiated by the UE #!ifdef K_TESTING if (is_in_profile("orig")){ #!else - if (P_is_in_dialog("orig")){ + if (P_is_in_dialog("orig") || has_totag()){ #!endif if (!is_method("CANCEL")) route(Orig_Subsequent); else route(Orig_Standalone); @@ -373,12 +373,13 @@ route { #!ifdef K_TESTING if (is_in_profile("term")){ #!else - if (P_is_in_dialog("term")){ + if (P_is_in_dialog("term") || has_totag()){ #!endif if (!is_method("CANCEL")) route(Term_Subsequent); else route(Orig_Standalone); break; - } + } + xlog("L_ERR", "No dialog yet\n"); # No dialog yet - ACK not relayed as hop-to-hop if (is_method("ACK")) break; @@ -543,7 +544,7 @@ route[REGISTER_494] route[add_charging_vector] { - $var(charging_vector) = "icid-value=\""+ICID_VALUE_PREFIX+$(Ts{s.encode.hexa})+$(shv(charging_icid_value_counter){s.encode.hexa})+"\";icid-generated-at="+ICID_VALUE_PREFIX+";orig-ioi=\""+ORIG_IOI+"\""; + $var(charging_vector) = "icid-value=\""+ICID_VALUE_PREFIX+$(Ts{s.encode.hexa})+$(shv(charging_icid_value_counter){s.encode.hexa})+"\";icid-generated-at="+ICID_GENERATOR_ADDR+";orig-ioi=\""+ORIG_IOI+"\""; append_hf("P-Charging-Vector: $var(charging_vector)\r\n"); # Increase counter by one: @@ -681,9 +682,8 @@ onreply_route[REGISTER_reply] else P_AAR("register"); } #!ifdef WITH_TLS - if (!P_security_relay()) + P_security_relay(); #!endif - P_NAT_relay(); } failure_route[REGISTER_failure] @@ -706,7 +706,6 @@ route[NOTIFY] ####### ORIGINATING route[Orig_Initial] { - xlog("L_ERR", "route[Orig_Initial]\n"); if (P_emergency_ruri()){ route(Orig_Initial_Emergency); break; @@ -722,7 +721,6 @@ route[Orig_Initial] }; # add IBCF/THIG route here if required loose_route(); - xlog("L_ERR", "1) $$du = $du\n"); if (!P_follows_service_routes()){ #Variant 1 - deny access to the network #send_reply("400","Bad Request - Not following indicated Service-Routes"); @@ -730,10 +728,8 @@ route[Orig_Initial] #Variant 2 - enforce routes and let the dialog continue P_enforce_service_routes(); } - xlog("L_ERR", "2) $$du = $du\n"); P_record_route("orig"); - xlog("L_ERR", "3) $$du = $du\n"); # Check for "sec-agree" in the Require header: if ($hdr(Require)) { @@ -765,14 +761,11 @@ route[Orig_Initial] send_reply("514","Originating dialog save failure - P-CSCF maximum dialog count reached!"); exit; } - xlog("L_ERR", "10) $$du = $du\n"); - if (is_method("INVITE")){ + if (isflagset(NAT_FLAG) && is_method("INVITE")){ #P_local_policy(); #check, if sdp is allowed, if not return with allowed sdp - P_NAT_relay(); route(RTPPROXY); } - xlog("L_ERR", "11) $$du = $du\n"); t_on_reply("Orig_Initial_reply"); t_on_failure("Orig_Initial_failure"); @@ -834,7 +827,7 @@ route[Orig_Initial_Emergency] exit; } - if (method=="INVITE"){ + if (isflagset(NAT_FLAG) && is_method("INVITE")){ route(RTPPROXY); } @@ -944,6 +937,7 @@ route[Orig_Subsequent] log(1,">> Orig_Subsequent\n"); if (P_is_registered()){ if (!P_assert_identity("non-emerg")){ + xlog("L_ERR", "Not registered!\n"); send_reply("403","Forbidden - You must register first with a S-CSCF"); break; }; @@ -954,13 +948,6 @@ route[Orig_Subsequent] }; } -# else{ - # let it continue as this probably does not come from an UE - #send_reply("403","Forbidden - Not Registered! You must register first with a S-CSCF"); - #break; - -# } - loose_route(); if (method!="CANCEL" && !P_follows_dialog_routes("orig")){ @@ -988,7 +975,6 @@ route[Orig_Subsequent] } if (method=="BYE" || method=="CANCEL"){ - #end_media_session(); P_STR("orig"); } @@ -999,8 +985,9 @@ route[Orig_Subsequent] # reply routes unused as empty at the moment t_on_reply("Orig_Subsequensend_reply"); #t_on_failure("Orig_Subsequent_failure"); - + xlog("L_ERR", "$rm: Forward to $ru ($du)\n"); if (!t_relay()) { + xlog("L_ERR", "Could not forward\n"); send_reply("500","Error forwarding originating subsequent request"); break; }; @@ -1010,14 +997,11 @@ onreply_route[Orig_Subsequensend_reply] { if (t_check_status("[1-2]..")){ P_update_dialog("orig"); - # P_replace_contact();??? } if (t_check_status("2..") && P_generates_aar("orig")){ if (!P_AAR("orig")) { P_release_call_onreply("orig"); - #end_media_session(); - } } @@ -1114,8 +1098,6 @@ failure_route[Orig_Standalone_failure] route[Term_Initial] { - xlog("L_ERR", "Term_Initial\n"); - P_record_route("term"); route(Check_Session_Expires); @@ -1124,20 +1106,18 @@ route[Term_Initial] send_reply("514","Terminating dialog save failure - P-CSCF maximum dialog count reached!"); exit; } - xlog("L_ERR", "Route: $hdr(Route)\n"); loose_route(); - xlog("L_ERR", "1) $$du = $du\n"); + if (check_route_param("received=.*")) setflag(NAT_FLAG); + if (isflagset(NAT_FLAG)) xlog("L_ERR", "Callee is behind NAT!\n"); t_on_reply("Term_Initial_reply"); #t_on_failure("Term_Initial_failure"); - if (method=="INVITE") { + if (is_method("INVITE") && isflagset(NAT_FLAG)) { route(RTPPROXY); } - if (!P_security_relay()) - P_NAT_relay(); + P_security_relay(); - xlog("L_ERR", "2) $$du = $du\n"); t_on_reply("Term_Initial_reply"); t_on_failure("Term_Initial_failure"); if (!t_relay()) { @@ -1151,14 +1131,16 @@ route[Term_Initial] onreply_route[Term_Initial_reply] { if (t_check_status("(180)|(183)|([2-9]..)")){ - route(RTPPROXY_REPLY); + if (isflagset(NAT_FLAG)) { + # Fix Contact Header in Reply to INVITE + fix_nated_contact(); + # Use RTP-Proxy, if required: + route(RTPPROXY_REPLY); + } if(P_generates_aar("term")){ # check if QoS is ok, orig - originating, term - terminating if (!P_AAR("term")) { P_release_call_onreply("term"); - # end_media_session(); - #} else { - # use_media_proxy(); } } } @@ -1206,6 +1188,8 @@ failure_route[Term_Initial_failure] route[Term_Subsequent] { + log(1,">> Term_Subsequent\n"); + route(Check_Session_Expires); P_update_dialog("term"); @@ -1220,7 +1204,6 @@ route[Term_Subsequent] if (method=="BYE") { P_STR("term"); # terminate authorization session - #end_media_session(); } # Check for "sec-agree" in the Require header: @@ -1247,9 +1230,9 @@ route[Term_Subsequent] t_on_reply("Term_Subsequensend_reply"); #t_on_failure("Term_Subsequent_failure"); - if (!P_security_relay()) - P_NAT_relay(); - xlog("L_ERR", "$$du = $du\n"); + P_security_relay(); + + xlog("L_ERR", "$rm: Forward to $ru ($du)\n"); if (!t_relay()) { send_reply("500","Error forwarding terminating subsequent request"); break; @@ -1298,9 +1281,7 @@ route[Term_Standalone] t_on_reply("Term_Standalone_reply"); #t_on_failure("Term_Standalone_failure"); - if (!P_security_relay()) - P_NAT_relay(); - xlog("L_ERR", "$$du = $du\n"); + P_security_relay(); if (!t_relay()) { send_reply("500","Error forwarding terminating standalone request"); break;

1 0

git:carstenbock/ims: - First working version of new Config with a lot of OpenIMS functions replaced with K-Routing logic
by Carsten Bock 27 Jan '11

27 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: fda7976aaacb33dcd00f8e52b9909a9d89abe9e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fda7976… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Wed Jan 26 18:57:20 2011 +0100 - First working version of new Config with a lot of OpenIMS functions replaced with K-Routing logic --- modules/pcscf/pcscf.cfg | 629 +++++++++++++++++++++++++++++++---------------- 1 files changed, 420 insertions(+), 209 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=fda…

1 0

git:master: modules_k/p_usrloc Fixed a typo
by Marius Zbihlei 25 Jan '11

25 Jan '11

Module: sip-router Branch: master Commit: ddc717ff392f30c126feae6e80db2a1c827b8ae0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ddc717f… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 25 11:06:37 2011 +0200 modules_k/p_usrloc Fixed a typo --- modules_k/p_usrloc/ul_db_failover.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/p_usrloc/ul_db_failover.c b/modules_k/p_usrloc/ul_db_failover.c index a4d2889..f9f14ed 100644 --- a/modules_k/p_usrloc/ul_db_failover.c +++ b/modules_k/p_usrloc/ul_db_failover.c @@ -186,7 +186,7 @@ static int ul_db_failover_switch(db_func_t * dbf, db1_con_t * dbh, ul_db_handle_ "db %i.\n", handle->id, no); return -1; } - memset(&tmp, 0, sizeof(ul_db_handle_t)); + memset(&tmp, 0, sizeof(ul_db_t)); memmove(&tmp, db, sizeof(ul_db_t)); memset(tmp.url.s, 0, UL_DB_URL_LEN); memmove(tmp.url.s, db->url.s, UL_DB_URL_LEN);

1 0

git:master: module_k/p_usrloc better documentation
by Marius Zbihlei 25 Jan '11

25 Jan '11

Module: sip-router Branch: master Commit: 820ef88912289cfff72dc153f5c1240300d49688 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=820ef88… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Jan 25 11:16:46 2011 +0200 module_k/p_usrloc better documentation --- modules_k/p_usrloc/README | 17 +++++++++-------- modules_k/p_usrloc/doc/p_usrloc_user.xml | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/modules_k/p_usrloc/README b/modules_k/p_usrloc/README index de1dddc..02854fe 100644 --- a/modules_k/p_usrloc/README +++ b/modules_k/p_usrloc/README @@ -205,14 +205,15 @@ Chapter 1. User's Guide recovers, the module makes sure that no stale contacts are returned from it. - Write queries are replicated to two databases, depending on some - distribution keys, e.g. the username and domain of some subscribers. - Its main field of application is for storing and retrieving location - data. The actual database for this subscriber is choosen from a set - that is specified in the master database. Read queries are executed on - one database of the set. If this database is not available, the other - database would be used. This failure is recorded in the master - database. + Write queries are replicated to two or more databases, depending on + some distribution keys, e.g. the username and domain the subscribers. + The number of databases used for replication is configurable at compile + time by modifying the DB_NUM define. Its main field of application is + for storing and retrieving location data. The actual database for this + subscriber is choosen from a set that is specified in the master + database. Read queries are executed on one database of the set. If this + database is not available, the other database would be used. This + failure is recorded in the master database. Connections to the distributed databases are setup prior the actual query is executed. The module maintains a cache of the database handles diff --git a/modules_k/p_usrloc/doc/p_usrloc_user.xml b/modules_k/p_usrloc/doc/p_usrloc_user.xml index 8bc8041..86d0cac 100644 --- a/modules_k/p_usrloc/doc/p_usrloc_user.xml +++ b/modules_k/p_usrloc/doc/p_usrloc_user.xml @@ -39,8 +39,9 @@ <para> </para> - <para>Write queries are replicated to two databases, depending on some - distribution keys, e.g. the username and domain of some subscribers. + <para>Write queries are replicated to two or more databases, depending on some + distribution keys, e.g. the username and domain the subscribers. The number of databases + used for replication is configurable at compile time by modifying the DB_NUM define. Its main field of application is for storing and retrieving location data. The actual database for this subscriber is choosen from a set that is specified in the master database. Read queries are executed on one database of the set. If this database is

1 0

← Newer
1
2
3
4
5
6
7
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011