Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: shimaore/ccnq3-opensips-ga
base: d9f13aaf20
...
head fork: shimaore/ccnq3-opensips-ga
compare: 58f175d005
  • 5 commits
  • 16 files changed
  • 0 commit comments
  • 1 contributor
View
2  common/opensips/compiler.coffee
@@ -64,7 +64,7 @@ macros_cfg = (t,params) ->
\b end \s+ if \s+ \1 \s+ is \s+ not \s+ \2 \b
///g, (str,$1,$2,$3) -> if params[$1] isnt $2 then $3 else ''
t = t.replace ///
- \b if \s+ (\w+)\ s+ is \s+ (\w+) \b
+ \b if \s+ (\w+) \s+ is \s+ (\w+) \b
([\s\S]*?)
\b end \s+ if \s+ \1 \s+ is \s+ \2 \b
///g, (str,$1,$2,$3) -> if params[$1] is $2 then $3 else ''
View
3  common/opensips/complete.json
@@ -7,7 +7,6 @@
"domain_db",
"usrloc_db",
"avpops_db",
- "accounting",
"toolbox",
"authenticate",
"nat",
@@ -34,14 +33,12 @@
"internal_ip": "",
"external_ip": "",
- "accounting": "none",
"authentication": "database",
"skip_uac_auth": 1,
"mp_allowed": 1,
"mp_always": 0,
"debug": 0,
- "radius_config": "",
"inv_timeout": 90,
"dialog_timeout": 28800,
View
2  common/opensips/conference.json
@@ -5,7 +5,6 @@
"generic",
"domain_db",
"db_http",
- "accounting",
"toolbox",
"nat",
"mediaproxy",
@@ -36,7 +35,6 @@
"local_port": 5064,
- "accounting": "",
"authentication": "",
"skip_uac_auth": 1,
"mp_allowed": 1,
View
6 common/opensips/default.json
@@ -14,11 +14,6 @@
"bflag_in_progress": 18,
"comment flag": "Transaction flags",
- "flag_accounting_syslog": 1,
- "flag_accounting_flatstore_calls": 2,
- "flag_accounting_flatstore_missed": 3,
- "flag_accounting_radius_calls": 4,
- "flag_accounting_radius_missed": 5,
"flag_request_mp_callee": 6,
"flag_request_mp_caller": 7,
"flag_failed_transaction": 12,
@@ -77,6 +72,7 @@
"long_fr_timer": 4,
"max_contacts": 0,
+ "radius_config": "",
"ok":true
}
View
2  common/opensips/emergency.json
@@ -8,7 +8,6 @@
"domain_db",
"db_http",
"nonat",
- "accounting",
"authenticate",
"invite",
"invite-emergency",
@@ -27,7 +26,6 @@
"internal_ip": "",
"external_ip": "",
- "accounting": "none",
"authentication": "database",
"skip_uac_auth": 1,
"mp_allowed": 1,
View
21 common/opensips/fragments/accounting.cfg
@@ -1,23 +1,2 @@
# Name: accounting
# Description: starts accounting methods (OBSOLETE)
-
-macro start_accounting
- if accounting is syslog
- # Enable accounting of calls in syslog
- setflag(${flag_accounting_syslog});
- end if accounting is syslog
-
- if accounting is flatstore
- # Enable accounting of calls in the flatstore database
- setflag(${flag_accounting_flatstore_calls});
- # Enable accounting of missed calls in the flatstore database
- setflag(${flag_accounting_flatstore_missed});
- end if accounting is flatstore
-
- if accounting is radius
- # Enable accounting of calls in Radius
- setflag(${flag_accounting_radius_calls});
- # Enable accounting of missed calls in Radius
- setflag(${flag_accounting_radius_missed});
- end if accounting is radius
-end macro start_accounting
View
36 common/opensips/fragments/accounting.modules
@@ -1,37 +1 @@
# accounting.modules -- modules and configuration for accounting
-
-loadmodule "acc.so"
-
-if accounting
-
-modparam("acc", "report_cancels", 1)
-modparam("acc", "early_media", 1)
-modparam("acc", "failed_transaction_flag", ${flag_failed_transaction})
-
-end if accounting
-
-if accounting is syslog
- modparam("acc", "log_extra", "${cdr_extra}")
- modparam("acc", "log_flag", ${flag_accounting_syslog_calls})
- modparam("acc", "log_missed_flag", ${flag_accounting_syslog_missed})
- modparam("acc", "log_level",1)
-end if accounting is syslog
-
-if accounting is flatstore
- modparam("acc", "db_extra", "${cdr_extra}")
- modparam("acc", "db_flag", ${flag_accounting_flatstore_calls})
- modparam("acc", "db_missed_flag", ${flag_accounting_flatstore_missed})
- modparam("acc", "db_table_acc", "acc")
- modparam("acc", "db_table_missed_calls", "missed_calls")
- modparam("acc", "db_url", "flatstore:/var/log/opensips")
-end if accounting is flatstore
-
-if accounting is radius
- # Untested
- loadmodule "aaa_radius.so"
- modparam("aaa", "radius_config", "${radius_config}")
- # These attributes need to be defined in a "dictionary" file first.
- modparam("acc", "aaa_extra", "${radius_extra}")
- modparam("acc", "aaa_flag", ${flag_accounting_radius_calls})
- modparam("acc", "aaa_missed_flag", ${flag_accounting_radius_missed})
-end if accounting is radius
View
5 common/opensips/fragments/authenticate.cfg
@@ -151,7 +151,7 @@ route[authenticate_check] {
}
}
-route[authenticate_register] {
+macro authenticate_register
xlog("L_DBG","-- authenticate_register -- Customer device from $si");
if authentication is radius
@@ -171,5 +171,4 @@ route[authenticate_register] {
end if authentication is database
consume_credentials();
-
-}
+end macro authenticate_register
View
8 common/opensips/fragments/forwarder.cfg
@@ -5,10 +5,10 @@
# Default Message Forwarder (anything except ACK/PRACK/CANCEL/UPDATE)
# -------------------------------------------------------------------
-# Note: in most cases (except from failure_route), a call to route(initial_forwarder) should be preceded by a call to route(update_media_proxy).
+# Note: in most cases (except from failure_route), a call to route(initial-forwarder) should be preceded by a call to route(update_media_proxy).
route[initial-forwarder] {
- xlog("L_DBG","-- route(initial_forwarder) Processing $rm $ru");
+ xlog("L_DBG","-- route(initial-forwarder) Processing $rm $ru");
if do_not_forward_register
if(is_method("REGISTER")) {
@@ -19,7 +19,7 @@ route[initial-forwarder] {
if not ignore_dest_domain
if($(avp(dest_domain))) {
- xlog("L_DBG","-- route(initial_forwarder) Using destination $(avp(dest_domain))");
+ xlog("L_DBG","-- route(initial-forwarder) Using destination $(avp(dest_domain))");
$rd = $(avp(dest_domain));
}
end if not ignore_dest_domain
@@ -55,7 +55,7 @@ route[initial-forwarder] {
end if not ignore_location
if not ignore_routing_data
- xlog("L_DBG","-- route(initial_forwarder) -- Location = $var(location)");
+ xlog("L_DBG","-- route(initial-forwarder) -- Location = $var(location)");
if( $var(location) && avp_db_load("$(var(location))","$(avp(location))") ) {
$json(location) := $avp(location);
View
6 common/opensips/fragments/invite.modules
@@ -11,12 +11,6 @@ if not skip_uac_auth
end if not skip_uac_auth
loadmodule "uac_redirect.so"
-if accounting is radius
- modparam("uac_redirect","acc_function","acc_rad_request")
-end if accounting is radius
-if accounting is flatstore
- modparam("uac_redirect","acc_function","acc_db_request")
-end if accounting is flatstore
loadmodule "dialog.so"
modparam("dialog", "enable_stats", 1) # default 1
View
3  common/opensips/fragments/non-loose-route.cfg
@@ -126,9 +126,6 @@ macro non_loose_route_handler
if(is_method("INVITE")) {
route(authenticate);
-
- ${start_accounting}
-
create_dialog("B");
route(invite-handler); # INVITE message handler
exit;
View
2  common/opensips/fragments/register-colocated.cfg
@@ -20,7 +20,7 @@ route[register-handler]
if( if has_trusted allow_trusted() || end if has_trusted 0 ) {
xlog("L_WARN", "WARNING -- register_handler -- Trusted device $si ($fu) attempts to register");
} else {
- route(authenticate_register);
+ ${authenticate_register}
if (!db_check_to()) {
xlog("L_WARN", "WARNING -- register_handler -- Rogue device $si ($fu) attempts to register");
View
3  common/opensips/fragments/register-registrar.cfg
@@ -17,7 +17,8 @@ route[register-handler]
xlog("L_DBG", "-- register_handler -- Forwarded REGISTER");
} else {
# If not coming from another registrar in the cluster, authenticate
- route(authenticate_register);
+ ${authenticate_register}
+
if (!db_check_to()) {
xlog("L_WARN", "WARNING -- register_handler -- Rogue device $si ($fu) attempts to register");
t_reply("401", "Unauthorized");
View
2  common/opensips/fragments/register-router.cfg
@@ -24,7 +24,7 @@ route[register-handler]
if( if has_trusted allow_trusted() || end if has_trusted 0 ) {
xlog("L_DBG", "-- register_handler -- Trusted device $si ($fu) attempts to register");
} else {
- route(authenticate_register);
+ ${authenticate_register}
if (!db_check_to()) {
xlog("L_WARN", "WARNING -- register_handler -- Rogue device $si ($fu) attempts to register");
View
3  common/opensips/outbound-proxy.json
@@ -6,7 +6,6 @@
"db_http",
"domain_db",
"avpops_db",
- "accounting",
"toolbox",
"authenticate",
"nonat",
@@ -33,14 +32,12 @@
"internal_ip": "",
"external_ip": "",
- "accounting": "none",
"authentication": "database",
"skip_uac_auth": 1,
"mp_allowed": 1,
"mp_always": 0,
"debug": 0,
- "radius_config": "",
"inv_timeout": 90,
"dialog_timeout": 28800,
View
2  common/opensips/registrant.json
@@ -7,7 +7,6 @@
"avpops_db",
"db_http",
"nonat",
- "accounting",
"registrant",
"invite",
"loose-route",
@@ -32,7 +31,6 @@
"local_port": 5064,
- "accounting": "",
"authentication": "",
"skip_uac_auth": 1,
"mp_allowed": 1,

No commit comments for this range

Something went wrong with that request. Please try again.