sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

New least cost routing module
by Andreas Granig 04 Dec '12

04 Dec '12

Guys, We've developed a module called lcr_rate.so, which acts on top of the existing lcr.so module and performs real cost-based least cost routing. It's quite Sipwise specific, so I wanted to ask whether there is any interest in - or it makes sense to - pushing it to upstream. The module is really simple from its functionality point of view. You call load_gws() as usual from the existing lcr.so module, and the lcr_rate.so module takes the resulting AVP and reorders the entries based on the cost per gateway: loadmodule "lcr.so" modparam("lcr", "gw_uri_avp", "$avp(s:lcr_uri_list)") loadmodule "lcr_rate.so" modparam("lcr_rate", "gw_uri_avp", "$avp(s:lcr_uri_list)") load_gws(...); lcr_rate("$rU", "$rd"); while(...) { next_gw(); ... } The actual cost per destination is calculated using libswrate, which we will publish as GPL along with the module. However, the whole inner workings are specific to our sip:provider CE/PRO platforms though, which means we are using the lcr_gw.flags column to store the gateway id from another table, which maps to gateway groups, which in turn reference to a billing profile id where the actual fees per destination are attached to. So to get any practical use out of this, you'd need to use the Sipwise provisioning and billing databases, or adapt your backend to reflect that. A way out of this lock-in would be to use diameter or radius to get the actual cost for a call, as this might be a standardized interface to do so (IMS?), but we currently don't use that. However, the module could later be modified to take advantage of that, once a diameter client is available in the main branch. If you say it doesn't make any sense at all (which might be likely), we're going to provide the source on our github page for people interested in it. Any comments/opinions? Andreas

1 0

git:master: sca: add working example kamailio.cfg
by Andrew Mortensen 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: c40883a7aa96a1a7fab1060bf9dfab2987971c89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c40883a… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Dec 3 17:14:14 2012 -0500 sca: add working example kamailio.cfg --- modules/sca/examples/kamailio.cfg | 414 +++++++++++++++++++++++++++++++++++++ 1 files changed, 414 insertions(+), 0 deletions(-) diff --git a/modules/sca/examples/kamailio.cfg b/modules/sca/examples/kamailio.cfg new file mode 100644 index 0000000..8cbae87 --- /dev/null +++ b/modules/sca/examples/kamailio.cfg @@ -0,0 +1,414 @@ +#!KAMAILIO +# +# example kamailio.cfg with Shared Call Appearances (SCA) + +#!define WITH_AUTH +#!define WITH_MYSQL +#!define WITH_SCA + +####### Defined Values ######### + +#!ifdef WITH_MYSQL +# - database URL - used to connect to database server by modules such +# as: auth_db, acc, usrloc, a.s.o. +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif +#!endif + +####### Global Parameters ######### + +#!ifdef WITH_DEBUG +debug=4 +log_stderror=yes +#!else +debug=2 +log_stderror=no +#!endif + +memdbg=5 +memlog=5 + +log_facility=LOG_LOCAL0 + +fork=yes +children=4 + +alias="vs7-dev.net.isc.upenn.edu" + +listen=udp:130.91.185.155:5060 +port=5060 + +####### Modules Section ######## + +# set paths to location of modules (to sources or installation folders) +#!ifdef WITH_SRCPATH +mpath="modules_k:modules" +#!else +mpath="/usr/local/kamailio/lib64/kamailio/modules_k/:/usr/local/kamailio/lib64/kamailio/modules/" +#!endif + +#!ifdef WITH_MYSQL +loadmodule "db_mysql.so" +#!endif + +loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "rr.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "usrloc.so" +loadmodule "registrar.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +loadmodule "ctl.so" +loadmodule "cfg_rpc.so" + +#!ifdef WITH_AUTH +loadmodule "auth.so" +loadmodule "auth_db.so" +#!ifdef WITH_IPAUTH +loadmodule "permissions.so" +#!endif +#!endif + +#!ifdef WITH_SCA +loadmodule "sca.so" +#!endif + + +# ----------------- setting module-specific parameters --------------- + + +# ----- tm params ----- +# auto-discard branches from previous serial forking leg +modparam("tm", "failure_reply_mode", 3) +# default retransmission timeout: 30sec +modparam("tm", "fr_timer", 30000) +# default invite retransmission timeout after 1xx: 120sec +modparam("tm", "fr_inv_timer", 120000) + + +# ----- rr params ----- +# add value to ;lr param to cope with most of the UAs +modparam("rr", "enable_full_lr", 1) +# do not append from tag to the RR (no need for this script) +modparam("rr", "append_fromtag", 0) + + +# ----- registrar params ----- +modparam("registrar", "method_filtering", 1) +/* uncomment the next line to disable parallel forking via location */ +# modparam("registrar", "append_branches", 0) +/* uncomment the next line not to allow more than 10 contacts per AOR */ +#modparam("registrar", "max_contacts", 10) +# max value for expires of registrations +modparam("registrar", "max_expires", 3600) +# set it to 1 to enable GRUU +modparam("registrar", "gruu_enabled", 0) + + +# ----- usrloc params ----- +/* enable DB persistency for location entries */ +#!ifdef WITH_USRLOCDB +modparam("usrloc", "db_url", DBURL) +modparam("usrloc", "db_mode", 2) +modparam("usrloc", "use_domain", 0) +#!endif + + +# ----- auth_db params ----- +#!ifdef WITH_AUTH +modparam("auth_db", "db_url", DBURL) +modparam("auth_db", "calculate_ha1", yes) +modparam("auth_db", "password_column", "password") +modparam("auth_db", "load_credentials", "") + +# ----- permissions params ----- +#!ifdef WITH_IPAUTH +modparam("permissions", "db_url", DBURL) +modparam("permissions", "db_mode", 1) +#!endif + +#!endif + +# ----- sca params ----- +#!ifdef WITH_SCA +modparam("sca", "call_info_max_expires", 120) +modparam("sca", "db_url", DBURL) +#!endif + + +####### Routing Logic ######## + +# Main SIP request routing logic +# - processing of any incoming SIP request starts with this route +# - note: this is the same as route { ... } +request_route { + + # per request initial checks + route(REQINIT); + + # CANCEL processing + if (is_method("CANCEL")) + { + if (t_check_trans()) + route(SCA); + t_relay(); + exit; + } + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + + t_check_trans(); + + # authentication + route(AUTH); + + # record routing for dialog forming requests (in case they are routed) + # - remove preloaded route headers + remove_hf("Route"); + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + # handle registrations + route(REGISTRAR); + + if ($rU==$null) + { + # request with no Username in RURI + sl_send_reply("484","Address Incomplete"); + exit; + } + + # user location service + route(LOCATION); + + route(RELAY); +} + + +route[RELAY] { + + # enable additional event routes for forwarded requests + if (is_method("INVITE|BYE|SUBSCRIBE|PRACK|REFER|UPDATE")) { + if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); + } + if (is_method("INVITE")) { + if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); + } + +#!ifdef WITH_SCA + route(SCA); +#!endif + + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +# Per SIP request initial checks +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; + } +} + +# Handle requests within SIP dialogs +route[WITHINDLG] { + if (has_totag()) { + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } + route(RELAY); + } else { + if (is_method("SUBSCRIBE") && uri == myself) { + # in-dialog subscribe requests + route(SCA); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # no loose-route, but stateful ACK; + # must be an ACK after a 487 + # or e.g. 404 from upstream server + t_relay(); + exit; + } else { + # ACK without matching transaction ... ignore and discard + exit; + } + } + sl_send_reply("404","Not here"); + } + exit; + } +} + +# Handle SIP registrations +route[REGISTRAR] { + if (is_method("REGISTER")) + { + if (!save("location")) + sl_reply_error(); + + exit; + } +} + +# USER location service +route[LOCATION] { + $avp(oexten) = $rU; + 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; + } + } +} + +# Authentication route +route[AUTH] { +#!ifdef WITH_AUTH + +#!ifdef WITH_IPAUTH + if((!is_method("REGISTER")) && allow_source_address()) + { + # source IP allowed + return; + } +#!endif + + if (is_method("REGISTER") || from_uri==myself) + { + # authenticate requests + if (!auth_check("$fd", "subscriber", "1")) { + auth_challenge("$fd", "0"); + exit; + } + # user authenticated - remove auth header + if(!is_method("REGISTER|PUBLISH")) + consume_credentials(); + } + # if caller is not local subscriber, then check if it calls + # a local destination, otherwise deny, not an open relay here + if (from_uri!=myself && uri!=myself) + { + sl_send_reply("403","Not relaying"); + exit; + } + +#!endif + return; +} + +# Shared Call Appearances handling +route[SCA] { +#!ifdef WITH_SCA + if(is_method("SUBSCRIBE")) { + if ($hdr(Event) == "call-info" || $hdr(Event) == "line-seize") { + xdbg("SCA: $hdr(Event) SUBSCRIBE $ru from $si:$sp"); + sca_handle_subscribe(); + exit; + } + + return; + } + + if (!is_method("BYE|CANCEL|INVITE|PRACK|REFER")) { + return; + } + + sca_call_info_update(); +#!endif + + return; +} + +# Routing to foreign domains +route[SIPOUT] { + if (!uri==myself) + { + append_hf("P-hint: outbound\r\n"); + route(RELAY); + } +} + +# XMLRPC routing +#!ifdef WITH_XMLRPC +route[XMLRPC] { + # allow XMLRPC from localhost + if ((method=="POST" || method=="GET") + && (src_ip==127.0.0.1)) { + # close connection only for xmlrpclib user agents (there is a bug in + # xmlrpclib: it waits for EOF before interpreting the response). + if ($hdr(User-Agent) =~ "xmlrpclib") + set_reply_close(); + set_reply_no_connect(); + dispatch_rpc(); + exit; + } + send_reply("403", "Forbidden"); + exit; +} +#!endif + +# manage incoming replies +onreply_route[MANAGE_REPLY] { + xdbg("incoming reply\n"); + +#!ifdef WITH_SCA + sca_call_info_update(); +#!endif +} + +# manage failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) { + exit; + } + +#!ifdef WITH_SCA + route(SCA); +#!endif +} + +#!ifdef WITH_XHTTP +event_route[xhttp:request] { +#!ifdef WITH_XHTTP_RPC + $var(xhttp_rpc_root) = $(hu{s.substr,0,9}); + if ($var(xhttp_rpc_root) == "/http_rpc") { + dispatch_xhttp_rpc(); + } +#!endif + +#!ifdef WITH_SCA +event_route[tm:local-request] { + if (is_method("NOTIFY") { + record_route(); + } +}

4 10

default flavour set to kamailio
by Daniel-Constantin Mierla 04 Dec '12

04 Dec '12

Hello, based on community interaction, development, package distributions and documentation maintenance in the recent years, the default flavour has been switched now to 'kamailio'. As written in my previous email, we started the last phase to complete the integration between kamailio-ser, aiming to get to a unique database schema and set of modules in maximum 6 months. Kamailio is the most spread and popular flavour, presented in many linux/unix distributions, being the one released and packaged periodically. So it will stay as main flavour, the one officially released by the project. Those that want can take the sources and build their own flavour, as the support in Makefile system is kept. Once the integration is finished, the flavour system will just set the application name, nothing else. From the open source project perspective, the resources will be allocated only on releasing under the main/default flavour (Kamailio). Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

Last phase of integration for kamailio - ser
by Daniel-Constantin Mierla 04 Dec '12

04 Dec '12

Hello, we plan to start the last phase of integration between kamailio and ser. After about 4 years with same source code tree, there is still some overhead caused by several duplicated modules. Following the decision to go on with the most developed components and absorb the missing features from the duplicates, kamailio modules are those that will stay (move to modules/ eventually) and get updates when needed. We used same decision to keep the core and makefile system from ser, adding to it what was extra in kamailio. I present next a summary of what is planned to happen: 1) Modules from modules_s/ that will be simply moved to modules/ because there is no conflict at all: - avp, avp_db, db_ops, eval, mangler, print, print_lib 2) Modules from modules_s/ that will be renamed and moved modules/ because it is mainly only conflict of name, but not in the backend (e.g., database): - auth_db => auth_dbattrs - because it uses (attribute,value) style to store subscriber profiles, which can be a preferred alternative for many out there - ldap => db2_ldap - it is a DB APIv2 connector to ldap server - bdb => db2_bdb - it is a DB APIv2 connector to berkeley db (to be double-checked) - xlog => xprintf - it uses %spec to print log messages with all the code inside the module - the only reason not discarding it and stick only to modules_k/xlog for the moment is because it is used from other modules, otherwise modules_k/xlog has more features (e.g., syslog facility, color printing, a.s.o) 3) Modules from modules_s/ that will be removed, after absorbing some extra features: - usrloc/registrar => get the ability to store AVPs per contact (modules_k is more advanced in features, like path/gruu/partial outbound support, publish presence states, etc.) - several modules must be reviewed: acc*, radius*, permissions, pike, gflags, options, timer 4) Modules from modules_s/ that will be removed, by moving to obsolete/ directory - the rest of them from modules_s/, like dialog, xcap, cpl-c, presence_b2b, dispatcher, dbtext, domain, etc. The categories and their content are not nailed down, it is the purpose of this discussion to see if something was overlooked. We hope to end this process in max 6 months time - after that will be a unique database schema and a unique set of modules. Flavour system in the Makefile will stay just for letting people choose easier the name of binary, otherwise everything will be the same (e.g., what is compiled, installed, etc). Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:master: Makefile.defs: version set to 3.4.0-dev7
by Daniel-Constantin Mierla 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: 94dde4a5b0f146914d124367ef73c5940cbb7d97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94dde4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Dec 4 10:48:23 2012 +0100 Makefile.defs: version set to 3.4.0-dev7 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index bc21034..f74b0a1 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev6 +EXTRAVERSION = -dev7 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master: sca: move working example SCA kamailio.cfg to doc subdirectory
by Andrew Mortensen 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: 0a2fc3f7490088b02861d9dace0f039ceab54af7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a2fc3f… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Dec 3 23:59:49 2012 -0500 sca: move working example SCA kamailio.cfg to doc subdirectory - will also be included in README and xml docs for convenience. --- modules/sca/doc/sca.cfg | 411 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 411 insertions(+), 0 deletions(-) diff --git a/modules/sca/doc/sca.cfg b/modules/sca/doc/sca.cfg new file mode 100644 index 0000000..a7cbafd --- /dev/null +++ b/modules/sca/doc/sca.cfg @@ -0,0 +1,411 @@ +#!KAMAILIO +# +# example kamailio.cfg with Shared Call Appearances (SCA) + +#!define WITH_AUTH +#!define WITH_MYSQL +#!define WITH_SCA + +####### Defined Values ######### + +#!ifdef WITH_MYSQL +# - database URL - used to connect to database server by modules such +# as: auth_db, acc, usrloc, a.s.o. +#!ifndef DBURL +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" +#!endif +#!endif + +####### Global Parameters ######### + +#!ifdef WITH_DEBUG +debug=4 +log_stderror=yes +#!else +debug=2 +log_stderror=no +#!endif + +memdbg=5 +memlog=5 + +log_facility=LOG_LOCAL0 + +fork=yes +children=4 + +listen=udp:10.0.0.10:5060 +port=5060 + +####### Modules Section ######## + +# set paths to location of modules (to sources or installation folders) +#!ifdef WITH_SRCPATH +mpath="modules_k:modules" +#!else +mpath="/usr/local/kamailio/lib64/kamailio/modules_k/:/usr/local/kamailio/lib64/kamailio/modules/" +#!endif + +#!ifdef WITH_MYSQL +loadmodule "db_mysql.so" +#!endif + +loadmodule "tm.so" +loadmodule "sl.so" +loadmodule "rr.so" +loadmodule "pv.so" +loadmodule "maxfwd.so" +loadmodule "usrloc.so" +loadmodule "registrar.so" +loadmodule "textops.so" +loadmodule "siputils.so" +loadmodule "xlog.so" +loadmodule "sanity.so" +loadmodule "ctl.so" +loadmodule "cfg_rpc.so" + +#!ifdef WITH_AUTH +loadmodule "auth.so" +loadmodule "auth_db.so" +#!ifdef WITH_IPAUTH +loadmodule "permissions.so" +#!endif +#!endif + +#!ifdef WITH_SCA +loadmodule "sca.so" +#!endif + + +# ----------------- setting module-specific parameters --------------- + + +# ----- tm params ----- +# auto-discard branches from previous serial forking leg +modparam("tm", "failure_reply_mode", 3) +# default retransmission timeout: 30sec +modparam("tm", "fr_timer", 30000) +# default invite retransmission timeout after 1xx: 120sec +modparam("tm", "fr_inv_timer", 120000) + + +# ----- rr params ----- +# add value to ;lr param to cope with most of the UAs +modparam("rr", "enable_full_lr", 1) +# do not append from tag to the RR (no need for this script) +modparam("rr", "append_fromtag", 0) + + +# ----- registrar params ----- +modparam("registrar", "method_filtering", 1) +/* uncomment the next line to disable parallel forking via location */ +# modparam("registrar", "append_branches", 0) +/* uncomment the next line not to allow more than 10 contacts per AOR */ +#modparam("registrar", "max_contacts", 10) +# max value for expires of registrations +modparam("registrar", "max_expires", 3600) +# set it to 1 to enable GRUU +modparam("registrar", "gruu_enabled", 0) + + +# ----- usrloc params ----- +/* enable DB persistency for location entries */ +#!ifdef WITH_USRLOCDB +modparam("usrloc", "db_url", DBURL) +modparam("usrloc", "db_mode", 2) +modparam("usrloc", "use_domain", 0) +#!endif + + +# ----- auth_db params ----- +#!ifdef WITH_AUTH +modparam("auth_db", "db_url", DBURL) +modparam("auth_db", "calculate_ha1", yes) +modparam("auth_db", "password_column", "password") +modparam("auth_db", "load_credentials", "") + +# ----- permissions params ----- +#!ifdef WITH_IPAUTH +modparam("permissions", "db_url", DBURL) +modparam("permissions", "db_mode", 1) +#!endif + +#!endif + +# ----- sca params ----- +#!ifdef WITH_SCA +modparam("sca", "call_info_max_expires", 300) +modparam("sca", "db_url", DBURL) +#!endif + + +####### Routing Logic ######## + +# Main SIP request routing logic +# - processing of any incoming SIP request starts with this route +# - note: this is the same as route { ... } +request_route { + + # per request initial checks + route(REQINIT); + + # CANCEL processing + if (is_method("CANCEL")) + { + if (t_check_trans()) + route(SCA); + t_relay(); + exit; + } + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + + t_check_trans(); + + # authentication + route(AUTH); + + # record routing for dialog forming requests (in case they are routed) + # - remove preloaded route headers + remove_hf("Route"); + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + # dispatch requests to foreign domains + route(SIPOUT); + + # handle registrations + route(REGISTRAR); + + if ($rU==$null) + { + # request with no Username in RURI + sl_send_reply("484","Address Incomplete"); + exit; + } + + # user location service + route(LOCATION); + + route(RELAY); +} + + +route[RELAY] { + + # enable additional event routes for forwarded requests + if (is_method("INVITE|BYE|SUBSCRIBE|PRACK|REFER|UPDATE")) { + if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY"); + } + if (is_method("INVITE")) { + if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE"); + } + + route(SCA); + + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +# Per SIP request initial checks +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; + } +} + +# Handle requests within SIP dialogs +route[WITHINDLG] { + if (has_totag()) { + # sequential request withing a dialog should + # take the path determined by record-routing + if (loose_route()) { + if ( is_method("NOTIFY") ) { + # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + record_route(); + } + route(RELAY); + } else { + if (is_method("SUBSCRIBE") && uri == myself) { + # in-dialog subscribe requests + route(SCA); + exit; + } + if ( is_method("ACK") ) { + if ( t_check_trans() ) { + # no loose-route, but stateful ACK; + # must be an ACK after a 487 + # or e.g. 404 from upstream server + t_relay(); + exit; + } else { + # ACK without matching transaction ... ignore and discard + exit; + } + } + sl_send_reply("404","Not here"); + } + exit; + } +} + +# Handle SIP registrations +route[REGISTRAR] { + if (is_method("REGISTER")) + { + if (!save("location")) + sl_reply_error(); + + exit; + } +} + +# USER location service +route[LOCATION] { + $avp(oexten) = $rU; + 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; + } + } +} + +# Authentication route +route[AUTH] { +#!ifdef WITH_AUTH + +#!ifdef WITH_IPAUTH + if((!is_method("REGISTER")) && allow_source_address()) + { + # source IP allowed + return; + } +#!endif + + if (is_method("REGISTER") || from_uri==myself) + { + # authenticate requests + if (!auth_check("$fd", "subscriber", "1")) { + auth_challenge("$fd", "0"); + exit; + } + # user authenticated - remove auth header + if(!is_method("REGISTER|PUBLISH")) + consume_credentials(); + } + # if caller is not local subscriber, then check if it calls + # a local destination, otherwise deny, not an open relay here + if (from_uri!=myself && uri!=myself) + { + sl_send_reply("403","Not relaying"); + exit; + } + +#!endif + return; +} + +# Shared Call Appearances handling +route[SCA] { +#!ifdef WITH_SCA + if(is_method("SUBSCRIBE")) { + if ($hdr(Event) == "call-info" || $hdr(Event) == "line-seize") { + xdbg("SCA: $hdr(Event) SUBSCRIBE $ru from $si:$sp"); + sca_handle_subscribe(); + exit; + } + + return; + } + + if (!is_method("BYE|CANCEL|INVITE|PRACK|REFER")) { + return; + } + + # this updates appearance state and NOTIFYs SCA subscribers as + # necessary. it also removes the Call-Info header, if found. + sca_call_info_update(); +#!endif + + return; +} + +# Routing to foreign domains +route[SIPOUT] { + if (!uri==myself) + { + append_hf("P-hint: outbound\r\n"); + route(RELAY); + } +} + +# XMLRPC routing +#!ifdef WITH_XMLRPC +route[XMLRPC] { + # allow XMLRPC from localhost + if ((method=="POST" || method=="GET") + && (src_ip==127.0.0.1)) { + # close connection only for xmlrpclib user agents (there is a bug in + # xmlrpclib: it waits for EOF before interpreting the response). + if ($hdr(User-Agent) =~ "xmlrpclib") + set_reply_close(); + set_reply_no_connect(); + dispatch_rpc(); + exit; + } + send_reply("403", "Forbidden"); + exit; +} +#!endif + +# manage incoming replies +onreply_route[MANAGE_REPLY] { + xdbg("incoming reply\n"); + + if (status =~ "[456][0-9][0-9]") { + # don't update SCA state here, since there may be + # failure route processing (e.g., call forwarding). + # update state in failure route instead. + return; + } + + route(SCA); +} + +# manage failure routing cases +failure_route[MANAGE_FAILURE] { + if (t_is_canceled()) { + exit; + } + + route(SCA); +} + +#!ifdef WITH_XHTTP +event_route[xhttp:request] { +#!ifdef WITH_XHTTP_RPC + $var(xhttp_rpc_root) = $(hu{s.substr,0,9}); + if ($var(xhttp_rpc_root) == "/http_rpc") { + dispatch_xhttp_rpc(); + } +#!endif

1 0

git:master: sca: more cleanup of SCA example kamailio.cfg
by Andrew Mortensen 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: b8007d985660b4df5ea9d5ea4347adf65b7f90fa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b8007d9… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Dec 3 23:59:50 2012 -0500 sca: more cleanup of SCA example kamailio.cfg - remove unused xhttp event route --- modules/sca/doc/sca.cfg | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/modules/sca/doc/sca.cfg b/modules/sca/doc/sca.cfg index a7cbafd..e8b44ac 100644 --- a/modules/sca/doc/sca.cfg +++ b/modules/sca/doc/sca.cfg @@ -400,12 +400,3 @@ failure_route[MANAGE_FAILURE] { route(SCA); } - -#!ifdef WITH_XHTTP -event_route[xhttp:request] { -#!ifdef WITH_XHTTP_RPC - $var(xhttp_rpc_root) = $(hu{s.substr,0,9}); - if ($var(xhttp_rpc_root) == "/http_rpc") { - dispatch_xhttp_rpc(); - } -#!endif

1 0

git:master: sca: include sample kamailio.cfg in docs, update function examples
by Andrew Mortensen 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: a635a80df762e13373ad59a6d746530c2163c2a6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a635a80… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Mon Dec 3 23:59:51 2012 -0500 sca: include sample kamailio.cfg in docs, update function examples --- modules/sca/README | 438 ++++++++++++++++++++++++++++++++++++- modules/sca/doc/sca_admin.xml | 35 +++- modules/sca/examples/kamailio.cfg | 412 ---------------------------------- 3 files changed, 455 insertions(+), 430 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a63…

1 0

git:master: app_python: better printing stacktrace
by Ovidiu Sas 04 Dec '12

04 Dec '12

Module: sip-router Branch: master Commit: 97fe5fec90999491d455b10b1fea7529e786719b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97fe5fe… Author: Konstantin M <evilzluk(a)gmail.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 3 22:35:21 2012 -0500 app_python: better printing stacktrace --- modules/app_python/TestCase_Traceback.py | 46 ++++++++++++++++++++++++++++++ modules/app_python/python_support.c | 41 +++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/modules/app_python/TestCase_Traceback.py b/modules/app_python/TestCase_Traceback.py new file mode 100644 index 0000000..6a673a0 --- /dev/null +++ b/modules/app_python/TestCase_Traceback.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- + +""" + Script for traceback test. + 2012.12.03: Created by: Konstantin M. <evilzluk(a)gmail.com> +""" + +import pprint + +class Loggers: + + def __init__(self): + pass + + def __del__(self): + pass + + def child_init(self, y): + return 0 + + def BuggyCode_lvl5(self, a): + a / 0 + + def BuggyCode_lvl4(self, a): + return self.BuggyCode_lvl5(a) + + def BuggyCode_lvl3(self, a): + return self.BuggyCode_lvl4(a) + + def BuggyCode_lvl2(self, a): + return self.BuggyCode_lvl3(a) + + def BuggyCode(self, a, b=None): + return self.BuggyCode_lvl2(a) + + + +def mod_init(): + return Loggers() + + + +if __name__ != "__main__": + import Router +else: + mod_init().BuggyCode(0) diff --git a/modules/app_python/python_support.c b/modules/app_python/python_support.c index e0ac4eb..01b290b 100644 --- a/modules/app_python/python_support.c +++ b/modules/app_python/python_support.c @@ -24,6 +24,8 @@ #include <stdio.h> #include "../../dprint.h" +#include "../../mem/mem.h" + #include "python_mod.h" void @@ -31,11 +33,12 @@ python_handle_exception(const char *fname) { PyObject *pResult; const char *msg; + char *buf; + size_t buflen; PyObject *exception, *v, *tb, *args; PyObject *line; int i; - LM_ERR("%s: Unhandled exception in the Python code:\n", fname); PyErr_Fetch(&exception, &v, &tb); PyErr_Clear(); if (exception == NULL) { @@ -61,22 +64,56 @@ python_handle_exception(const char *fname) LM_ERR("can't get traceback, traceback.format_exception() has failed\n"); return; } + + buflen = 1; + buf = (char *)pkg_malloc(buflen * sizeof(char *)); + if (!buf) + { + LM_ERR("python_handle_exception(): Not enough memory\n"); + return; + } + memset(&buf, 0, buflen * sizeof(char *)); + for (i = 0; i < PySequence_Size(pResult); i++) { line = PySequence_GetItem(pResult, i); if (line == NULL) { LM_ERR("can't get traceback, PySequence_GetItem() has failed\n"); Py_DECREF(pResult); + if (buf) + pkg_free(buf); return; } + msg = PyString_AsString(line); + if (msg == NULL) { LM_ERR("can't get traceback, PyString_AsString() has failed\n"); Py_DECREF(line); Py_DECREF(pResult); + if (buf) + pkg_free(buf); return; } - LM_ERR("\t%s", msg); + + buflen += strlen(msg); + buf = (char *)pkg_realloc(buf, (buflen + 1) * sizeof(char *)); + if (!buf) + { + LM_ERR("python_handle_exception(): Not enough memory\n"); + Py_DECREF(line); + Py_DECREF(pResult); + return; + } + + strcat(buf, msg); + Py_DECREF(line); } + + LM_ERR("%s: Unhandled exception in the Python code:\n%s", fname, buf); + + if (buf) + pkg_free(buf); + Py_DECREF(pResult); }

1 0

git:master: app_lua: fix cross-compilation
by Ovidiu Sas 03 Dec '12

03 Dec '12

Module: sip-router Branch: master Commit: d41c9a91afdd7a5a2c5e689f3302211c6bbeffb6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d41c9a9… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Mon Dec 3 18:39:19 2012 -0500 app_lua: fix cross-compilation --- modules/app_lua/Makefile | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 6be02a7..af30c4a 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -7,17 +7,24 @@ include ../../Makefile.defs auto_gen= NAME=app_lua.so +ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which lua-config) +endif + ifeq ($(BUILDER),) + ifeq ($(CROSS_COMPILE),) BUILDER = $(shell which pkg-config) + endif ifeq ($(BUILDER),) - LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1) + LUA51 = $(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1) + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lm ifeq ($(LUA51),) - DEFS+=-I/usr/include/lua - LIBS= -llua -lm + DEFS+=-I$(LOCALBASE)/include/lua + LIBS+=-llua else - DEFS+=-I/usr/include/lua5.1 - LIBS= -llua5.1 -lm + DEFS+=-I$(LOCALBASE)/include/lua5.1 + LIBS+=-llua5.1 endif else LUAVER=XX

1 0

← Newer
1
...
36
37
38
39
40
41
42
43
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012