sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: examples: added WebSocket edge proxy example using outbound for NAT traversal
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: 96a1af2f261085db695d8a3b23c1a16f39b393fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96a1af2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 21:07:07 2013 +0100 examples: added WebSocket edge proxy example using outbound for NAT traversal --- examples/outbound/edge_websocket.cfg | 293 ++++++++++++++++++++++++++++++++++ 1 files changed, 293 insertions(+), 0 deletions(-) diff --git a/examples/outbound/edge_websocket.cfg b/examples/outbound/edge_websocket.cfg new file mode 100644 index 0000000..843ec20 --- /dev/null +++ b/examples/outbound/edge_websocket.cfg @@ -0,0 +1,293 @@ +#!KAMAILIO +# +# Edge proxy configuration with SIP over WebSocket support +# + +#!substdef "!DBURL!sqlite:///etc/kamailio/db.sqlite!g" +#!substdef "!MY_IP_ADDR!a.b.c.d!g" +#!substdef "!MY_DOMAIN!example.com!g" +#!substdef "!MY_WS_PORT!80!g" +#!substdef "!MY_WSS_PORT!443!g" +#!substdef "!MY_WS_ADDR!tcp:MY_IP_ADDR:MY_WS_PORT!g" +#!substdef "!MY_WSS_ADDR!tls:MY_IP_ADDR:MY_WSS_PORT!g" + +#!substdef "!REGISTRAR_IP!e.f.g.h!g" +#!substdef "!REGISTRAR_PORT!5060!g" +#!substdef "!FLOW_TIMER!20!g" + +#!define WITH_TLS +#!define WITH_WEBSOCKETS + + +####### Global Parameters ######### + +debug=2 +log_stderror=no +log_facility=LOG_LOCAL0 +fork=yes +children=4 +mpath="/usr/lib64/kamailio/modules/" +force_rport=yes + +#!ifdef WITH_TLS +enable_tls=1 +#!endif + +listen=MY_IP_ADDR +#!ifdef WITH_WEBSOCKETS +listen=MY_WS_ADDR +#!ifdef WITH_TLS +listen=MY_WSS_ADDR +#!endif +#!endif + +tcp_connection_lifetime=30 # FLOW_TIMER + 10 +tcp_accept_no_cl=yes +tcp_rd_buf_size=16384 + + +####### Modules Section ######## + +loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "outbound.so" +loadmodule "rr.so" +loadmodule "path.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +loadmodule "ctl.so" +loadmodule "mi_rpc.so" +loadmodule "mi_fifo.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "stun.so" +loadmodule "kex.so" +loadmodule "corex.so" +#!ifdef WITH_TLS +loadmodule "tls.so" +#!endif +#!ifdef WITH_WEBSOCKETS +loadmodule "xhttp.so" +loadmodule "websocket.so" +#!endif + +# ----------------- setting module-specific parameters --------------- + +# ----- mi_fifo params ----- +modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") + +# ----- tm params ----- +modparam("tm", "failure_reply_mode", 3) + +# ----- rr params ----- +modparam("rr", "append_fromtag", 0) + +# ----- corex params ----- +modparam("corex", "alias_subdomains", "MY_DOMAIN") + +#!ifdef WITH_TLS +# ----- tls params ----- +modparam("tls", "tls_method", "SSLv23") +modparam("tls", "certificate", "/etc/pki/CA/ser1_cert.pem") +modparam("tls", "private_key", "/etc/pki/CA/privkey.pem") +modparam("tls", "ca_list", "/etc/pki/CA/calist.pem") +#!endif + +#!ifdef WITH_WEBSOCKETS +# ----- websocket params ----- +modparam("websocket", "keepalive_timeout", 25) # FLOW_TIMER + 5 +#!endif + + +####### Routing Logic ######## + +request_route { + if (($Rp == MY_WS_PORT || $Rp == MY_WSS_PORT) + && !(proto == WS || proto == WSS)) { + xlog("L_WARN", "SIP request received on $Rp\n"); + sl_send_reply("403", "Forbidden"); + exit; + } + + route(REQINIT); + + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } + exit; + } + + route(WITHINDLG); + + t_check_trans(); + + if (is_method("REGISTER")) { + remove_hf("Route"); + add_path(); + $du = "sip:REGISTRAR_IP:REGISTRAR_PORT"; + } else { + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + if (@via[2] == "") { + # From client so route to registrar... + + if ($rU == $null) { + sl_send_reply("484", "Address Incomplete"); + exit; + } + remove_hf("Route"); + $du = "sip:REGISTRAR_IP:REGISTRAR_PORT"; + } else { + # From registrar so route using "Route:" headers... + + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + default: + xlog("L_ERR", "in request_route\n"); + sl_reply_error(); + exit; + } + } + + t_on_failure("FAIL_OUTBOUND"); + } + } + + route(RELAY); +} + +route[RELAY] { + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +route[REQINIT] { + if (!mf_process_maxfwd_header("10")) { + sl_send_reply("483","Too Many Hops"); + exit; + } + + if(!sanity_check("1511", "7")) + { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } +} + +route[WITHINDLG] { + if (has_totag()) { + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + default: + if (is_method("ACK")) { + if ( t_check_trans() ) { + route(RELAY); + exit; + } else { + exit; + } + } + sl_send_reply("404","Not Found"); + } + } else { + if (is_method("NOTIFY")) { + record_route(); + } + route(RELAY); + } + exit; + } +} + +onreply_route { + if (($Rp == MY_WS_PORT || $Rp == MY_WSS_PORT) + && !(proto == WS || proto == WSS)) { + xlog("L_WARN", "SIP response received on $Rp\n"); + drop; + } + + if (!t_check_trans()) { + drop; + } + + if ($rm == "REGISTER" && $rs >= 200 && $rs <= 299) { + remove_hf("Flow-Timer"); + if ($(hdr(Require)[*])=~"outbound") + insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); + } +} + +failure_route[FAIL_OUTBOUND] { + if (t_branch_timeout() || !t_branch_replied()) { + send_reply("430", "Flow Failed"); + } +} + +event_route[xhttp:request] { + set_reply_close(); + set_reply_no_connect(); + + if ($Rp != MY_WS_PORT +#!ifdef WITH_TLS + && $Rp != MY_WSS_PORT +#!endif + ) { + xlog("L_WARN", "HTTP request received on $Rp\n"); + xhttp_reply("403", "Forbidden", "", ""); + exit; + } + + xlog("L_DBG", "HTTP Request Received\n"); + + if ($hdr(Upgrade)=~"websocket" + && $hdr(Connection)=~"Upgrade" + && $rm=~"GET") { + + # Validate Host - make sure the client is using the correct + # alias for WebSockets + if ($hdr(Host) == $null || !is_myself("sip:" + $hdr(Host))) { + xlog("L_WARN", "Bad host $hdr(Host)\n"); + xhttp_reply("403", "Forbidden", "", ""); + exit; + } + + # Optional... validate Origin - make sure the client is from an + # authorised website. For example, + # + # if ($hdr(Origin) != "http://communicator.MY_DOMAIN" + # && $hdr(Origin) != "https://communicator.MY_DOMAIN") { + # xlog("L_WARN", "Unauthorised client $hdr(Origin)\n"); + # xhttp_reply("403", "Forbidden", "", ""); + # exit; + # } + + # Optional... perform HTTP authentication + + # ws_handle_handshake() exits (no further configuration file + # processing of the request) when complete. + if (ws_handle_handshake()) + { + # Optional... cache some information about the + # successful connection + exit; + } + } + + xhttp_reply("404", "Not Found", "", ""); +} + +event_route[websocket:closed] { + xlog("L_INFO", "WebSocket connection from $si:$sp has closed\n"); +}

1 0

git:master: examples: added outbound edge proxy and registrar example configurations
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: 4f68c5626530a1bfe2c7ce72eb3de24b3e7e73dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f68c56… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 21:06:36 2013 +0100 examples: added outbound edge proxy and registrar example configurations --- examples/outbound/edge.cfg | 172 +++++++++++++++++++++++++++++++++ examples/outbound/registrar.cfg | 202 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 374 insertions(+), 0 deletions(-) diff --git a/examples/outbound/edge.cfg b/examples/outbound/edge.cfg new file mode 100644 index 0000000..2bdf93b --- /dev/null +++ b/examples/outbound/edge.cfg @@ -0,0 +1,172 @@ +#!KAMAILIO +# +# Edge proxy configuration +# + +#!substdef "!REGISTRAR_IP!a.b.c.d!g" +#!substdef "!REGISTRAR_PORT!5060!g" +#!substdef "!FLOW_TIMER!20!g" + +####### Global Parameters ######### + +debug=2 +log_stderror=no +log_facility=LOG_LOCAL0 +fork=yes +children=4 +alias="example.com" +mpath="/usr/lib64/kamailio/modules" +tcp_connection_lifetime=30 # FLOW_TIMER + 10 +force_rport=yes + + +####### Modules Section ######## + +loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "outbound.so" +loadmodule "rr.so" +loadmodule "path.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +loadmodule "ctl.so" +loadmodule "mi_rpc.so" +loadmodule "mi_fifo.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "stun.so" + +# ----------------- setting module-specific parameters --------------- + +# ----- mi_fifo params ----- +modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") + +# ----- tm params ----- +modparam("tm", "failure_reply_mode", 3) + +# ----- rr params ----- +modparam("rr", "append_fromtag", 0) + + +####### Routing Logic ######## + +request_route { + route(REQINIT); + + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } + exit; + } + + route(WITHINDLG); + + t_check_trans(); + + if (is_method("REGISTER")) { + remove_hf("Route"); + add_path(); + $du = "sip:REGISTRAR_IP:REGISTRAR_PORT"; + } else { + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + if (@via[2] == "") { + # From client so route to registrar... + + if ($rU == $null) { + sl_send_reply("484", "Address Incomplete"); + exit; + } + remove_hf("Route"); + $du = "sip:REGISTRAR_IP:REGISTRAR_PORT"; + } else { + # From registrar so route using "Route:" headers... + + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + default: + xlog("L_ERR", "in request_route\n"); + sl_reply_error(); + exit; + } + } + + t_on_failure("FAIL_OUTBOUND"); + } + } + + route(RELAY); +} + +route[RELAY] { + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +route[REQINIT] { + if (!mf_process_maxfwd_header("10")) { + sl_send_reply("483","Too Many Hops"); + exit; + } + + if(!sanity_check("1511", "7")) + { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } +} + +route[WITHINDLG] { + if (has_totag()) { + if (!loose_route()) { + switch($rc) { + case -2: + sl_send_reply("403", "Forbidden"); + exit; + default: + if (is_method("ACK")) { + if ( t_check_trans() ) { + route(RELAY); + exit; + } else { + exit; + } + } + sl_send_reply("404","Not Found"); + } + } else { + if (is_method("NOTIFY")) { + record_route(); + } + route(RELAY); + } + exit; + } +} + +onreply_route { + if (!t_check_trans()) { + drop; + } + + if ($rm == "REGISTER" && $rs >= 200 && $rs <= 299) { + remove_hf("Flow-Timer"); + if ($(hdr(Require)[*])=~"outbound") + insert_hf("Flow-Timer: FLOW_TIMER\r\n", "Call-ID"); + } +} + +failure_route[FAIL_OUTBOUND] { + if (t_branch_timeout() || !t_branch_replied()) { + send_reply("430", "Flow Failed"); + } +} diff --git a/examples/outbound/registrar.cfg b/examples/outbound/registrar.cfg new file mode 100644 index 0000000..db920fa --- /dev/null +++ b/examples/outbound/registrar.cfg @@ -0,0 +1,202 @@ +#!KAMAILIO +# +# Registrar configuration +# + + +####### Global Parameters ######### + +debug=2 +log_stderror=no +log_facility=LOG_LOCAL0 +fork=yes +children=4 +alias="example.com" +mpath="/usr/lib64/kamailio/modules" + + +####### Modules Section ######## + +loadmodule "tm.so" +loadmodule "tmx.so" +loadmodule "sl.so" +loadmodule "rr.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +loadmodule "ctl.so" +loadmodule "mi_rpc.so" +loadmodule "mi_fifo.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "usrloc.so" +loadmodule "registrar.so" + +# ----------------- setting module-specific parameters --------------- + +# ----- mi_fifo params ----- +modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") + + +# ----- tm params ----- +modparam("tm", "failure_reply_mode", 3) +modparam("tm", "restart_fr_on_each_reply", 0) +modparam("tm", "contact_flows_avp", "tm_contact_flows") +modparam("tm", "contacts_avp", "tm_contacts") + +# ----- rr params ----- +modparam("rr", "append_fromtag", 0) + +# ----- registrar params ----- +modparam("registrar", "use_path", 1) +modparam("registrar", "gruu_enabled", 1) +modparam("registrar", "outbound_mode", 1) + + +####### Routing Logic ######## + +request_route { + route(REQINIT); + + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } + exit; + } + + route(WITHINDLG); + + t_check_trans(); + + remove_hf("Route"); + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + route(REGISTRAR); + + if ($rU==$null) { + xlog("L_INFO", "Address Incomplete\n"); + send_reply("484","Address Incomplete"); + exit; + } + + route(LOCATION); +} + + +route[RELAY] { + if (!t_relay()) { + xlog("L_ERR", "t_relay() failed\n"); + sl_reply_error(); + } + exit; +} + +route[REQINIT] { + if (!mf_process_maxfwd_header("10")) { + xlog("L_INFO", "Too Many Hops\n"); + send_reply("483","Too Many Hops"); + exit; + } + + if(!sanity_check("1511", "7")) + { + xlog("Malformed SIP message from $si:$sp\n"); + exit; + } +} + +route[WITHINDLG] { + if (has_totag()) { + if (loose_route()) { + if (is_method("NOTIFY")) { + record_route(); + } + route(RELAY); + } else { + if (is_method("ACK")) { + if (t_check_trans()) { + route(RELAY); + exit; + } else { + exit; + } + } + xlog("L_INFO", "Not Found"); + send_reply("404","Not Found"); + } + exit; + } +} + +route[REGISTRAR] { + if (is_method("REGISTER")) + { + if (!save("location")) { + xlog("L_ERR", "Unable to save location\n"); + sl_reply_error(); + } + exit; + } +} + +route[LOCATION] { + if (!lookup("location")) { + $var(rc) = $rc; + t_newtran(); + switch ($var(rc)) { + case -1: + case -3: + send_reply("404", "Not Found"); + exit; + case -2: + send_reply("405", "Method Not Allowed"); + exit; + } + } + + if (!t_load_contacts() || !t_next_contacts()) { + xlog("L_ERR", "t_(load|next)_contacts() failed\n"); + sl_reply_error(); + exit; + } + + t_on_failure("FAIL_TRANSACTION"); + t_on_branch_failure("FAIL-BRANCH"); + route(RELAY); + exit; +} + +onreply_route { + if (!t_check_trans()) { + drop; + } +} + +failure_route[FAIL_TRANSACTION] { + if (!t_check_status("6[0-9][0-9]")) { + if (t_next_contacts()) { + t_relay(); + exit; + } + } + + if (t_check_status("430")) { + t_reply("480", "Temporarily Unavailable"); + exit; + } +} + +event_route[tm:branch-failure:FAIL-BRANCH] { + if (t_check_status("403|430") + || (t_branch_timeout() && !t_branch_replied())) { + unregister("location", "$tu", "$T_reply_ruid"); + + if (t_next_contact_flow()) { + t_on_branch_failure("FAIL-BRANCH"); + t_relay(); + } + } +}

1 0

git:master: examples: updated basic websocket example
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: a0c85d1187dd75a8ab6db9604baee93a5d4f478f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0c85d1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 21:04:56 2013 +0100 examples: updated basic websocket example --- examples/websocket.cfg | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/websocket.cfg b/examples/websocket.cfg index 4176af0..9178622 100644 --- a/examples/websocket.cfg +++ b/examples/websocket.cfg @@ -49,10 +49,10 @@ syn_branch=0 #!ifdef LOCAL_TEST_RUN debug=2 -mpath="modules_k:modules" +mpath="modules" #!else debug=0 -mpath="/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/" +mpath="/usr/lib64/kamailio/modules/" #!endif loadmodule "db_sqlite.so" @@ -345,7 +345,6 @@ onreply_route { && !(proto == WS || proto == WSS)) || $Rp == MY_MSRP_PORT) { xlog("L_WARN", "SIP response received on $Rp\n"); drop; - exit; } if (nat_uac_test(64)) {

1 0

git:master: modules/outbound: Updated examples (edge proxy and registrar) in documentation
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: cf908dc57b4f62e8daf28c7a0199284bd0b4dc69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf908dc… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 21:04:24 2013 +0100 modules/outbound: Updated examples (edge proxy and registrar) in documentation --- modules/outbound/README | 224 ++++++++++++++++++++++++++----- modules/outbound/doc/outbound_admin.xml | 224 ++++++++++++++++++++++++++----- 2 files changed, 374 insertions(+), 74 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cf9…

1 0

[tracker] Comment added: usrloc module stops updating some records in db_mode 2
by sip-router 24 Apr '13

24 Apr '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- I just pushed some patches to git master branch. Set db_ops_ruid parameter of usrloc module to 1 and give it a try. It enables doing queries to database for update/delete of records using ruid in WHERE instead of values for aor, contact and call-id. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment857 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.

3 3

git:master: modules/rr: Double-route and outbound support in loose.c
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: 1e84948d120ef2b1206f90458d47486239cfd81b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e84948… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 14:24:45 2013 +0100 modules/rr: Double-route and outbound support in loose.c - Have removed outbound support from strict routing for now as it was incorrect and I don't have a system to test with. --- modules/rr/loose.c | 110 +++++++++++++++++++++++----------------------------- 1 files changed, 49 insertions(+), 61 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index 50c4774..ad19e81 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -571,7 +571,7 @@ static inline int after_strict(struct sip_msg* _m) char* rem_off; str uri; struct socket_info *si; - int use_ob, next_is_strict; + int next_is_strict; hdr = _m->route; rt = (rr_t*)hdr->parsed; @@ -588,14 +588,11 @@ static inline int after_strict(struct sip_msg* _m) } next_is_strict = is_strict(&puri.params); - if ((use_ob = process_outbound(_m, puri.user, &uri)) < 0) { - LM_ERR("processing outbound flow-token\n"); - return FLOW_TOKEN_BROKEN; - } - if (!use_ob && enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) { + if (enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) { /* double route may occure due different IP and port, so force as * send interface the one advertise in second Route */ + si = grep_sock_info( &puri.host, puri.port_no, puri.proto); if (si) { set_force_socket(_m, si); @@ -650,11 +647,9 @@ static inline int after_strict(struct sip_msg* _m) * always be a strict router because endpoints don't use ;lr parameter * In this case we will simply put the URI in R-URI and forward it, * which will work perfectly */ - if (!use_ob) { - if(get_maddr_uri(&uri, &puri)!=0) { - LM_ERR("failed to check maddr\n"); - return RR_ERROR; - } + if(get_maddr_uri(&uri, &puri)!=0) { + LM_ERR("failed to check maddr\n"); + return RR_ERROR; } if (rewrite_uri(_m, &uri) < 0) { LM_ERR("failed to rewrite request URI\n"); @@ -676,11 +671,9 @@ static inline int after_strict(struct sip_msg* _m) LM_DBG("Next hop: '%.*s' is loose router\n", uri.len, ZSW(uri.s)); - if (!use_ob) { - if(get_maddr_uri(&uri, &puri)!=0) { - LM_ERR("failed to check maddr\n"); - return RR_ERROR; - } + if(get_maddr_uri(&uri, &puri)!=0) { + LM_ERR("failed to check maddr\n"); + return RR_ERROR; } if (set_dst_uri(_m, &uri) < 0) { LM_ERR("failed to set dst_uri\n"); @@ -745,10 +738,7 @@ static inline int after_strict(struct sip_msg* _m) if(routed_params.len > 0) run_rr_callbacks( _m, &routed_params ); - if (use_ob == 1) - return RR_OB_DRIVEN; - else - return RR_DRIVEN; + return RR_DRIVEN; } @@ -767,7 +757,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) int status; str uri; struct socket_info *si; - int uri_is_myself, use_ob, next_is_strict; + int uri_is_myself, next_is_strict; + int use_ob = 0; hdr = _m->route; rt = (rr_t*)hdr->parsed; @@ -784,12 +775,6 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) next_is_strict = is_strict(&puri.params); routed_params = puri.params; uri_is_myself = is_myself(&puri); - if ((use_ob = process_outbound(_m, puri.user, &uri)) < 0) { - LM_ERR("processing outbound flow-token\n"); - return FLOW_TOKEN_BROKEN; - } - - LM_DBG("process_outbound returned <%d>\n", use_ob); /* IF the URI was added by me, remove it */ if (uri_is_myself>0) @@ -799,6 +784,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* set the hooks for the params */ routed_msg_id = _m->id; + if ((use_ob = process_outbound(_m, puri.user, &uri)) < 0) { + LM_ERR("processing outbound flow-token\n"); + return FLOW_TOKEN_BROKEN; + } + if (!rt->next) { /* No next route in the same header, remove the whole header * field immediately @@ -808,10 +798,6 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) return RR_ERROR; } - /* When using outbound skip past all this stuff and just set - the destination */ - if (use_ob) goto got_uri; - res = find_next_route(_m, &hdr); if (res < 0) { LM_ERR("failed to find next route\n"); @@ -825,14 +811,15 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) rt = (rr_t*)hdr->parsed; } else rt = rt->next; - if (!use_ob) { - if (enable_double_rr && is_2rr(&puri.params)) { - /* double route may occure due different IP and port, so force as - * send interface the one advertise in second Route */ - if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { - LM_ERR("failed to parse the double route URI\n"); - return RR_ERROR; - } + if (enable_double_rr && is_2rr(&puri.params)) { + /* double route may occure due different IP and port, so force as + * send interface the one advertise in second Route */ + if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { + LM_ERR("failed to parse the double route URI\n"); + return RR_ERROR; + } + + if (!use_ob) { si = grep_sock_info( &puri.host, puri.port_no, puri.proto); if (si) { set_force_socket(_m, si); @@ -840,28 +827,30 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) if (enable_socket_mismatch_warning) LM_WARN("no socket found for match second RR\n"); } - - if (!rt->next) { - /* No next route in the same header, remove the whole header - * field immediately */ - if (!del_lump(_m, hdr->name.s - _m->buf, hdr->len, 0)) { - LM_ERR("failed to remove Route HF\n"); - return RR_ERROR; - } - res = find_next_route(_m, &hdr); - if (res < 0) { - LM_ERR("failed to find next route\n"); - return RR_ERROR; - } - if (res > 0) { /* No next route found */ - LM_DBG("no next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); - goto done; - } - rt = (rr_t*)hdr->parsed; - } else rt = rt->next; } - + + if (!rt->next) { + /* No next route in the same header, remove the whole header + * field immediately */ + if (!del_lump(_m, hdr->name.s - _m->buf, hdr->len, 0)) { + LM_ERR("failed to remove Route HF\n"); + return RR_ERROR; + } + res = find_next_route(_m, &hdr); + if (res < 0) { + LM_ERR("failed to find next route\n"); + return RR_ERROR; + } + if (res > 0) { /* No next route found */ + LM_DBG("no next URI found\n"); + status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + goto done; + } + rt = (rr_t*)hdr->parsed; + } else rt = rt->next; + } + + if (!use_ob) { uri = rt->nameaddr.uri; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); @@ -889,7 +878,6 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } else { /* Next hop is loose router */ LM_DBG("Next URI is a loose router\n"); -got_uri: if (!use_ob) { if(get_maddr_uri(&uri, &puri)!=0) {

2 1

git:master: modules/rr: Fixes relating to outbound and record-routing
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: e8cf4ef94d8759641ce682b50bad303baa58a2e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8cf4ef… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 16:34:29 2013 +0100 modules/rr: Fixes relating to outbound and record-routing --- modules/rr/loose.c | 65 +++++++++++++++++++++++++++----------------------- modules/rr/record.c | 7 +---- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index ad19e81..e9d9a43 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -501,12 +501,12 @@ static char uri_buf[MAX_ROUTE_URI_LEN]; * \param dst_uri string to write the destination URI to (extracted from flow-token) * \return -1 on error, 0 when outbound not in use, 1 when outbound in use */ -static inline int process_outbound(struct sip_msg *_m, str flow_token, - str *dst_uri) +static inline int process_outbound(struct sip_msg *_m, str flow_token) { int ret; struct receive_info *rcv = NULL; struct socket_info *si; + str dst_uri; if (!rr_obb.decode_flow_token) return 0; @@ -534,22 +534,29 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, } /* Second, override the destination URI */ - dst_uri->s = uri_buf; - dst_uri->len = 0; + dst_uri.s = uri_buf; + dst_uri.len = 0; - dst_uri->len += snprintf(dst_uri->s + dst_uri->len, - MAX_ROUTE_URI_LEN - dst_uri->len, + dst_uri.len += snprintf(dst_uri.s + dst_uri.len, + MAX_ROUTE_URI_LEN - dst_uri.len, "sip:%s", rcv->src_ip.af == AF_INET6 ? "[" : ""); - dst_uri->len += ip_addr2sbuf(&rcv->src_ip, - dst_uri->s + dst_uri->len, - MAX_ROUTE_URI_LEN - dst_uri->len); - dst_uri->len += snprintf(dst_uri->s + dst_uri->len, - MAX_ROUTE_URI_LEN - dst_uri->len, + dst_uri.len += ip_addr2sbuf(&rcv->src_ip, + dst_uri.s + dst_uri.len, + MAX_ROUTE_URI_LEN - dst_uri.len); + dst_uri.len += snprintf(dst_uri.s + dst_uri.len, + MAX_ROUTE_URI_LEN - dst_uri.len, "%s:%d;transport=%s", rcv->src_ip.af == AF_INET6 ? "]" : "", rcv->src_port, get_proto_name(rcv->proto)); + + if (set_dst_uri(_m, &dst_uri) < 0) { + LM_ERR("failed to set dst_uri\n"); + return -1; + } + ruri_mark_new(); + return 1; } @@ -754,7 +761,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) struct sip_uri puri; rr_t* rt; int res; - int status; + int status = RR_DRIVEN; str uri; struct socket_info *si; int uri_is_myself, next_is_strict; @@ -784,7 +791,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* set the hooks for the params */ routed_msg_id = _m->id; - if ((use_ob = process_outbound(_m, puri.user, &uri)) < 0) { + if ((use_ob = process_outbound(_m, puri.user)) < 0) { LM_ERR("processing outbound flow-token\n"); return FLOW_TOKEN_BROKEN; } @@ -850,12 +857,10 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } else rt = rt->next; } - if (!use_ob) { - uri = rt->nameaddr.uri; - if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); - return RR_ERROR; - } + uri = rt->nameaddr.uri; + if (parse_uri(uri.s, uri.len, &puri) < 0) { + LM_ERR("failed to parse the first route URI\n"); + return RR_ERROR; } } else { #ifdef ENABLE_USER_CHECK @@ -884,14 +889,15 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) LM_ERR("checking maddr failed\n"); return RR_ERROR; } - } - if (set_dst_uri(_m, &uri) < 0) { - LM_ERR("failed to set dst_uri\n"); - return RR_ERROR; - } - /* dst_uri changed, so it makes sense to re-use the current uri for + + if (set_dst_uri(_m, &uri) < 0) { + LM_ERR("failed to set dst_uri\n"); + return RR_ERROR; + } + /* dst_uri changed, so it makes sense to re-use the current uri for forking */ - ruri_mark_new(); /* re-use uri for serial forking */ + ruri_mark_new(); /* re-use uri for serial forking */ + } /* There is a previous route uri which was 2nd uri of mine * and must be removed here */ @@ -903,12 +909,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } } } - if (use_ob == 1) - status = RR_OB_DRIVEN; - else - status = RR_DRIVEN; done: + if (use_ob == 1) + status = RR_OB_DRIVEN; + /* run RR callbacks only if we have Route URI parameters */ if(routed_params.len > 0) run_rr_callbacks( _m, &routed_params ); diff --git a/modules/rr/record.c b/modules/rr/record.c index 62de981..c160e98 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -447,8 +447,7 @@ int record_route(struct sip_msg* _m, str *params) return -3; } - if (build_rr(l, l2, &user, tag, params, use_ob ? OUTBOUND : INBOUND, - sips) < 0) { + if (build_rr(l, l2, &user, tag, params, INBOUND, sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -787,9 +786,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -6; } - if (build_advertised_rr(l, l2, _data, &user, tag, - use_ob ? OUTBOUND: INBOUND, - sips) < 0) { + if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; }

1 0

git:master: pkg/kamailio/(centos|fedora): Updated rel in .spec file
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: 9b1f607ccd3575a2c3a4aba7f6c36e637f9d7022 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b1f607… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 14:28:36 2013 +0100 pkg/kamailio/(centos|fedora): Updated rel in .spec file --- pkg/kamailio/fedora/17/kamailio.spec | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index c1e7501..9dcf363 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel dev2%{dist} +%define rel dev3%{dist} @@ -1109,6 +1109,8 @@ fi %changelog +* Wed Apr 24 2013 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated rel to dev3 * Wed Apr 10 2013 Peter Dunkley <peter(a)dunkley.me.uk> - Added sipt module to .spec - Updated rel to dev2

1 0

git:master: core: Fixed error where "; transport=wss" parameter was sometimes added to URIs
by Peter Dunkley 24 Apr '13

24 Apr '13

Module: sip-router Branch: master Commit: 0b8cbbd8359a3c049b0da7a743de3b996412ab35 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b8cbbd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Apr 24 14:26:09 2013 +0100 core: Fixed error where ";transport=wss" parameter was sometimes added to URIs - It should always be ";transport=ws" with WebSocket --- ip_addr.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ip_addr.c b/ip_addr.c index c071f83..7f7cf64 100644 --- a/ip_addr.c +++ b/ip_addr.c @@ -351,9 +351,8 @@ char* get_proto_name(unsigned int proto) case PROTO_SCTP: return "sctp"; case PROTO_WS: - return "ws"; case PROTO_WSS: - return "wss"; + return "ws"; default: return "unknown"; }

1 0

git:admorten/sca: modules/sca: add sca. subscription_count to rpc exports list.
by Andrew Mortensen 24 Apr '13

24 Apr '13

Module: sip-router Branch: admorten/sca Commit: f546e6a832f1a4146b24e1d225258cf33a7e7618 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f546e6a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Wed Apr 24 11:30:35 2013 -0400 modules/sca: add sca.subscription_count to rpc exports list. --- modules/sca/sca.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/sca/sca.c b/modules/sca/sca.c index b2a912d..9d407ad 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -65,6 +65,8 @@ static cmd_export_t cmds[] = { static rpc_export_t sca_rpc[] = { { "sca.all_subscriptions", sca_rpc_show_all_subscriptions, sca_rpc_show_all_subscriptions_doc, 0 }, + { "sca.subscription_count", sca_rpc_subscription_count, + sca_rpc_subscription_count_doc, 0 }, { "sca.show_subscription", sca_rpc_show_subscription, sca_rpc_show_subscription_doc, 0 }, { "sca.subscribers", sca_rpc_show_subscribers,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013