From 78216407e277c020c1d8414a54b1a976bdc00f7d Mon Sep 17 00:00:00 2001 From: DanB Date: Thu, 2 May 2019 20:11:03 +0200 Subject: [PATCH] Updating opensips.cfg for 3.0 configuration --- data/tariffplans/oldtutorial/Chargers.csv | 2 + .../tutorials/osips/opensips/etc/opensips.cfg | 264 ------------------ .../osips/opensips/etc/opensips/opensips.cfg | 43 ++- 3 files changed, 20 insertions(+), 289 deletions(-) create mode 100644 data/tariffplans/oldtutorial/Chargers.csv delete mode 100644 data/tutorials/osips/opensips/etc/opensips.cfg diff --git a/data/tariffplans/oldtutorial/Chargers.csv b/data/tariffplans/oldtutorial/Chargers.csv new file mode 100644 index 000000000..c270b5867 --- /dev/null +++ b/data/tariffplans/oldtutorial/Chargers.csv @@ -0,0 +1,2 @@ +#Tenant,ID,FilterIDs,ActivationInterval,RunID,AttributeIDs,Weight +cgrates.org,DEFAULT,,,*default,*none,0 \ No newline at end of file diff --git a/data/tutorials/osips/opensips/etc/opensips.cfg b/data/tutorials/osips/opensips/etc/opensips.cfg deleted file mode 100644 index d77beff7f..000000000 --- a/data/tutorials/osips/opensips/etc/opensips.cfg +++ /dev/null @@ -1,264 +0,0 @@ -# -# OpenSIPS residential configuration script -# by OpenSIPS Solutions -# -# This script was generated via "make menuconfig", from -# the "Residential" scenario. -# You can enable / disable more features / functionalities by -# re-generating the scenario with different options.# -# -# Please refer to the Core CookBook at: -# http://www.opensips.org/Resources/DocsCookbooks -# for a explanation of possible statements, functions and parameters. -# - - -####### Global Parameters ######### - -log_level=3 -log_stderror=no -log_facility=LOG_LOCAL0 - -udp_workers=4 - -auto_aliases=no - -listen=udp:enp0s8:5060 - - -####### Modules Section ######## - -#set module path -mpath="/usr/lib/x86_64-linux-gnu/opensips/modules/" - -#### SIGNALING module -loadmodule "signaling.so" - -#### StateLess module -loadmodule "sl.so" - -#### Transaction Module -loadmodule "tm.so" -modparam("tm", "fr_timeout", 5) -modparam("tm", "fr_inv_timeout", 30) -modparam("tm", "restart_fr_on_each_reply", 0) -modparam("tm", "onreply_avp_mode", 1) - -#### Record Route Module -loadmodule "rr.so" -/* do not append from tag to the RR (no need for this script) */ -modparam("rr", "append_fromtag", 0) - -#### MAX ForWarD module -loadmodule "maxfwd.so" - -#### SIP MSG OPerationS module -loadmodule "sipmsgops.so" - -#### FIFO Management Interface -loadmodule "mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo") -modparam("mi_fifo", "fifo_mode", 0666) - -#### USeR LOCation module -loadmodule "usrloc.so" -modparam("usrloc", "nat_bflag", "NAT") -modparam("usrloc", "db_mode", 0) - -#### REGISTRAR module -loadmodule "registrar.so" -modparam("registrar", "tcp_persistent_flag", "TCP_PERSISTENT") - -#### ACCounting module -loadmodule "acc.so" -modparam("acc", "early_media", 0) -modparam("acc", "report_cancels", 0) -modparam("acc", "detect_direction", 0) - -loadmodule "proto_udp.so" - - -#### CGRateS module -loadmodule "dialog.so" -loadmodule "cgrates.so" -modparam("cgrates", "cgrates_engine", "127.0.0.1:2014") - - -####### Routing Logic ######## - -# main request routing logic - -route{ - - if (!mf_process_maxfwd_header(10)) { - send_reply(483,"Too Many Hops"); - exit; - } - - if (has_totag()) { - - # handle hop-by-hop ACK (no routing required) - if ( is_method("ACK") && t_check_trans() ) { - t_relay(); - exit; - } - - # sequential request within a dialog should - # take the path determined by record-routing - if ( !loose_route() ) { - # we do record-routing for all our traffic, so we should not - # receive any sequential requests without Route hdr. - send_reply(404, "Not here"); - exit; - } - - if (is_method("BYE")) { - # do accounting even if the transaction fails - do_accounting("log","failed"); - } - - # route it out to whatever destination was set by loose_route() - # in $du (destination URI). - route(relay); - exit; - } - - # CANCEL processing - if (is_method("CANCEL")) { - if (t_check_trans()) - t_relay(); - exit; - } - - # absorb retransmissions, but do not create transaction - t_check_trans(); - - if ( !(is_method("REGISTER") ) ) { - - if (is_myself("$fd")) { - - } else { - # if caller is not local, then called number must be local - - if (!is_myself("$rd")) { - send_reply(403,"Relay Forbidden"); - exit; - } - } - - } - - # preloaded route checking - if (loose_route()) { - xlog("L_ERR", - "Attempt to route with preloaded Route's [$fu/$tu/$ru/$ci]"); - if (!is_method("ACK")) - send_reply(403, "Preload Route denied"); - exit; - } - - # record routing - if (!is_method("REGISTER|MESSAGE")) - record_route(); - - if (!is_myself("$rd")) { - append_hf("P-hint: outbound\r\n"); - - route(relay); - } - - # requests for my domain - - if (is_method("PUBLISH|SUBSCRIBE")) { - send_reply(503, "Service Unavailable"); - exit; - } - - if (is_method("REGISTER")) { - - if (!save("location")) - sl_reply_error(); - - exit; - } - - if ($rU==NULL) { - # request with no Username in RURI - send_reply(484,"Address Incomplete"); - exit; - } - - # do lookup with method filtering - if (!lookup("location","m")) { - t_reply(404, "Not Found"); - exit; - } - - # check auth with CGRateS - $cgr_opt(GetMaxUsage) = 1; # also retrieve the max usage - $cgr_opt(GetAttributes) = 1; - $cgr_opt(GetSuppliers) = 1; - $cgr_opt(AuthorizeResources) = 1; - $cgr_opt(ProcessThresholds) = 1; - $cgr_opt(ProcessStatQueues) = 1; - $cgr(RequestType) = "*prepaid"; - $cgr(OriginHost) = "127.0.0.1"; - $cgr(Source) = "OpenSIPS"; - - if (!async(cgrates_auth("$fU", "$rU"), resume_cgr_auth)) { - sl_send_reply(503, "Service Unavailable"); - exit; - } -} - -route [resume_cgr_auth] { - xlog("### Authorized the call with CGRateS"); - if ($rc == 0) { - xlog("Call not authorized: code=$cgrret!\n"); - send_reply(403, "Forbidden"); - exit; - } - $var(idx) = 0; - while ($(cgr_ret(AttributesDigest){s.select,$var(idx),,}) != NULL) { - $avp($(cgr_ret(AttributesDigest){s.select,$var(idx),,}{s.select,0,:})) - = $(cgr_ret(AttributesDigest){s.select,$var(idx),,}{s.select,1,:}); - $var(idx) = $var(idx) + 1; - } - cgrates_acc("cdr|missed", "$fU", "$rU"); - xlog("### Have authorized the call and it should go through"); - route(relay); -} - - -route[relay] { - # for INVITEs enable some additional helper routes - if (is_method("INVITE")) { - t_on_branch("per_branch_ops"); - t_on_reply("handle_nat"); - t_on_failure("missed_call"); - } - - if (!t_relay()) { - send_reply(500,"Internal Error"); - } - exit; -} - - - - -branch_route[per_branch_ops] { - xlog("new branch at $ru\n"); -} - - -onreply_route[handle_nat] { - xlog("incoming reply\n"); -} - - -failure_route[missed_call] { - if (t_was_cancelled()) { - exit; - } -} diff --git a/data/tutorials/osips/opensips/etc/opensips/opensips.cfg b/data/tutorials/osips/opensips/etc/opensips/opensips.cfg index 739c88055..6d4d94f1c 100644 --- a/data/tutorials/osips/opensips/etc/opensips/opensips.cfg +++ b/data/tutorials/osips/opensips/etc/opensips/opensips.cfg @@ -19,15 +19,11 @@ log_level=3 log_stderror=no log_facility=LOG_LOCAL0 -children=4 +udp_workers=4 auto_aliases=no -listen=udp:enp0s3:5060 -listen=udp:127.0.0.1:5080 -listen=udp:127.0.0.1:5060 -listen=udp:enp0s3:5080 - +listen=udp:enp0s8:5060 ####### Modules Section ######## @@ -64,10 +60,6 @@ loadmodule "mi_fifo.so" modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo") modparam("mi_fifo", "fifo_mode", 0666) -#### URI module -loadmodule "uri.so" -modparam("uri", "use_uri_table", 0) - #### USeR LOCation module loadmodule "usrloc.so" modparam("usrloc", "nat_bflag", "NAT") @@ -98,8 +90,8 @@ modparam("cgrates", "cgrates_engine", "127.0.0.1:2014") route{ - if (!mf_process_maxfwd_header("10")) { - send_reply("483","Too Many Hops"); + if (!mf_process_maxfwd_header(10)) { + send_reply(483,"Too Many Hops"); exit; } @@ -116,7 +108,7 @@ route{ if ( !loose_route() ) { # we do record-routing for all our traffic, so we should not # receive any sequential requests without Route hdr. - send_reply("404","Not here"); + send_reply(404, "Not here"); exit; } @@ -149,7 +141,7 @@ route{ # if caller is not local, then called number must be local if (!is_myself("$rd")) { - send_reply("403","Relay Forbidden"); + send_reply(403,"Relay Forbidden"); exit; } } @@ -161,7 +153,7 @@ route{ xlog("L_ERR", "Attempt to route with preloaded Route's [$fu/$tu/$ru/$ci]"); if (!is_method("ACK")) - send_reply("403","Preload Route denied"); + send_reply(403, "Preload Route denied"); exit; } @@ -178,7 +170,7 @@ route{ # requests for my domain if (is_method("PUBLISH|SUBSCRIBE")) { - send_reply("503", "Service Unavailable"); + send_reply(503, "Service Unavailable"); exit; } @@ -192,13 +184,13 @@ route{ if ($rU==NULL) { # request with no Username in RURI - send_reply("484","Address Incomplete"); + send_reply(484,"Address Incomplete"); exit; } # do lookup with method filtering if (!lookup("location","m")) { - t_reply("404", "Not Found"); + t_reply(404, "Not Found"); exit; } @@ -214,17 +206,17 @@ route{ $cgr(Source) = "OpenSIPS"; if (!async(cgrates_auth("$fU", "$rU"), resume_cgr_auth)) { - sl_send_reply("503", "Service Unavailable"); + sl_send_reply(503, "Service Unavailable"); exit; } } route [resume_cgr_auth] { - if ($rc == 0) { - xlog("Call not authorized: code=$cgrret!\n"); - send_reply("403", "Forbidden"); - exit; - } + if ($rc != 1) { + xlog("Call not authorized: code=$cgrret!\n"); + send_reply(403, "Forbidden"); + exit; + } $var(idx) = 0; while ($(cgr_ret(AttributesDigest){s.select,$var(idx),,}) != NULL) { $avp($(cgr_ret(AttributesDigest){s.select,$var(idx),,}{s.select,0,:})) @@ -232,6 +224,7 @@ route [resume_cgr_auth] { $var(idx) = $var(idx) + 1; } cgrates_acc("cdr|missed", "$fU", "$rU"); + xlog("### Have authorized the call and it should go through"); route(relay); } @@ -245,7 +238,7 @@ route[relay] { } if (!t_relay()) { - send_reply("500","Internal Error"); + send_reply(500,"Internal Error"); } exit; }