diff --git a/CHANGES b/CHANGES
index e7f0656f5721bc115b228ad10e6f8c6a4233ac2d..4844f85339dc98dc9cd1ba9e21d755674332fd12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -279,6 +279,12 @@ res_parking:
for these variables. The indefinite inheritance is also recommended
for the PARKINGEXTEN variable.
+res_pjsip
+------------------
+ * Added new global option (disable_multi_domain) to pjsip.
+ Disabling Multi Domain can improve realtime performace by reducing
+ number of database requsts.
+
chan_pjsip
------------------
* Added 'pjsip show channelstats' CLI command.
diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 94d17920860c863a0d99789a8620ac0aee98b2aa..6a08edcd3d88b1bef1933275ea39b87c87342e59 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -907,6 +907,11 @@
; (default: "0")
;contact_expiration_check_interval=30
; The interval (in seconds) to check for expired contacts.
+;disable_multi_domain=no
+ ; Disable Multi Domain support.
+ ; If disabled it can improve realtime performace by reducing
+ ; number of database requsts
+ ; (default: "no")
;endpoint_identifier_order=ip,username,anonymous
; The order by which endpoint identifiers are given priority.
; Identifier names are derived from res_pjsip_endpoint_identifier_*
diff --git a/contrib/ast-db-manage/config/versions/8d478ab86e29_pjsip_add_disable_multi_domain.py b/contrib/ast-db-manage/config/versions/8d478ab86e29_pjsip_add_disable_multi_domain.py
new file mode 100644
index 0000000000000000000000000000000000000000..a782685847d1d0cec005432a4174ad386d8e000b
--- /dev/null
+++ b/contrib/ast-db-manage/config/versions/8d478ab86e29_pjsip_add_disable_multi_domain.py
@@ -0,0 +1,31 @@
+"""pjsip_add_disable_multi_domain
+
+Revision ID: 8d478ab86e29
+Revises: 1c688d9a003c
+Create Date: 2016-04-15 11:41:26.988997
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '8d478ab86e29'
+down_revision = '1c688d9a003c'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ENUM
+
+YESNO_NAME = 'yesno_values'
+YESNO_VALUES = ['yes', 'no']
+
+def upgrade():
+ ############################# Enums ##############################
+
+ # yesno_values have already been created, so use postgres enum object
+ # type to get around "already created" issue - works okay with mysql
+ yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
+
+ op.add_column('ps_globals', sa.Column('disable_multi_domain', yesno_values))
+
+
+def downgrade():
+ op.drop_column('ps_globals', 'disable_multi_domain')
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index 1bfae66b3593cfc134a4f5e738b1de683794c0da..d06fce967e65637b103fce11590a7abb55b9cb37 100644
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -2212,6 +2212,13 @@ unsigned int ast_sip_get_keep_alive_interval(void);
*/
unsigned int ast_sip_get_contact_expiration_check_interval(void);
+/*!
+ * \brief Retrieve the system setting 'disable multi domain'.
+ * \since 13.9.0
+ *
+ * \retval non zero if disable multi domain.
+ */
+unsigned int ast_sip_get_disable_multi_domain(void);
/*!
* \brief Retrieve the system max initial qualify time.
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index d12951c45fe57d10276060e695d8bd49fb1b6d03..428e58d11c70880e8fcdf31a2a0935b68b68eb06 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -1294,6 +1294,12 @@
<configOption name="contact_expiration_check_interval" default="30">
<synopsis>The interval (in seconds) to check for expired contacts.</synopsis>
</configOption>
+ <configOption name="disable_multi_domain" default="no">
+ <synopsis>Disable Multi Domain support</synopsis>
+ <description><para>
+ If disabled it can improve realtime performace by reducing number of database requsts.
+ </para></description>
+ </configOption>
<configOption name="max_initial_qualify_time" default="0">
<synopsis>The maximum amount of time from startup that qualifies should be attempted on all contacts.
If greater than the qualify_frequency for an aor, qualify_frequency will be used instead.</synopsis>
diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c
index 8348a1eb5bd397c236c1e227b2a3cbf6e23ada89..ccfec543572d861867117134fc5257150431ca0e 100644
--- a/res/res_pjsip/config_global.c
+++ b/res/res_pjsip/config_global.c
@@ -37,6 +37,7 @@
#define DEFAULT_FROM_USER "asterisk"
#define DEFAULT_REGCONTEXT ""
#define DEFAULT_CONTACT_EXPIRATION_CHECK_INTERVAL 30
+#define DEFAULT_DISABLE_MULTI_DOMAIN 0
#define DEFAULT_VOICEMAIL_EXTENSION ""
static char default_useragent[256];
@@ -64,6 +65,8 @@ struct global_config {
unsigned int max_initial_qualify_time;
/* The interval at which to check for expired contacts */
unsigned int contact_expiration_check_interval;
+ /*! Nonzero to disable multi domain support */
+ unsigned int disable_multi_domain;
};
static void global_destructor(void *obj)
@@ -222,6 +225,21 @@ unsigned int ast_sip_get_contact_expiration_check_interval(void)
return interval;
}
+unsigned int ast_sip_get_disable_multi_domain(void)
+{
+ unsigned int disable_multi_domain;
+ struct global_config *cfg;
+
+ cfg = get_global_cfg();
+ if (!cfg) {
+ return DEFAULT_DISABLE_MULTI_DOMAIN;
+ }
+
+ disable_multi_domain = cfg->disable_multi_domain;
+ ao2_ref(cfg, -1);
+ return disable_multi_domain;
+}
+
unsigned int ast_sip_get_max_initial_qualify_time(void)
{
unsigned int time;
@@ -373,6 +391,8 @@ int ast_sip_initialize_sorcery_global(void)
ast_sorcery_object_field_register(sorcery, "global", "contact_expiration_check_interval",
__stringify(DEFAULT_CONTACT_EXPIRATION_CHECK_INTERVAL),
OPT_UINT_T, 0, FLDSET(struct global_config, contact_expiration_check_interval));
+ ast_sorcery_object_field_register(sorcery, "global", "disable_multi_domain", "no",
+ OPT_BOOL_T, 1, FLDSET(struct global_config, disable_multi_domain));
if (ast_sorcery_instance_observer_add(sorcery, &observer_callbacks_global)) {
return -1;
diff --git a/res/res_pjsip_endpoint_identifier_anonymous.c b/res/res_pjsip_endpoint_identifier_anonymous.c
index d9d7e03daab7662848d2fbab8214a650c33cd8e4..a529466325fcfc9f69ac5140bf30984eab359134 100644
--- a/res/res_pjsip_endpoint_identifier_anonymous.c
+++ b/res/res_pjsip_endpoint_identifier_anonymous.c
@@ -69,28 +69,30 @@ static struct ast_sip_endpoint *anonymous_identify(pjsip_rx_data *rdata)
return NULL;
}
- /* Attempt to find the endpoint given the name and domain provided */
- snprintf(id, sizeof(id), "anonymous@%s", domain_name);
- if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
- goto done;
- }
-
- /* See if an alias exists for the domain provided */
- if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) {
- snprintf(id, sizeof(id), "anonymous@%s", alias->domain);
+ if (!ast_sip_get_disable_multi_domain()) {
+ /* Attempt to find the endpoint given the name and domain provided */
+ snprintf(id, sizeof(id), "anonymous@%s", domain_name);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
goto done;
}
- }
- /* See if the transport this came in on has a provided domain */
- if ((transport_states = ast_sip_get_transport_states())
- && (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
- && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
- && !ast_strlen_zero(transport->domain)) {
- snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
- if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
- goto done;
+ /* See if an alias exists for the domain provided */
+ if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) {
+ snprintf(id, sizeof(id), "anonymous@%s", alias->domain);
+ if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
+ goto done;
+ }
+ }
+
+ /* See if the transport this came in on has a provided domain */
+ if ((transport_states = ast_sip_get_transport_states())
+ && (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
+ && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
+ && !ast_strlen_zero(transport->domain)) {
+ snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
+ if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
+ goto done;
+ }
}
}
diff --git a/res/res_pjsip_endpoint_identifier_user.c b/res/res_pjsip_endpoint_identifier_user.c
index 9a2bc89e45d3164d81eda953efb03df4f0753b8e..12af2edb98e7f1d295ef25208e6e3be8de069e0d 100644
--- a/res/res_pjsip_endpoint_identifier_user.c
+++ b/res/res_pjsip_endpoint_identifier_user.c
@@ -69,28 +69,30 @@ static struct ast_sip_endpoint *username_identify(pjsip_rx_data *rdata)
return NULL;
}
- /* Attempt to find the endpoint given the name and domain provided */
- snprintf(id, sizeof(id), "%s@%s", endpoint_name, domain_name);
- if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
- goto done;
- }
-
- /* See if an alias exists for the domain provided */
- if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) {
- snprintf(id, sizeof(id), "%s@%s", endpoint_name, alias->domain);
+ if (!ast_sip_get_disable_multi_domain()) {
+ /* Attempt to find the endpoint given the name and domain provided */
+ snprintf(id, sizeof(id), "%s@%s", endpoint_name, domain_name);
if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
goto done;
}
- }
- /* See if the transport this came in on has a provided domain */
- if ((transport_states = ast_sip_get_transport_states())
- && (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
- && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
- && !ast_strlen_zero(transport->domain)) {
- snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
- if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
- goto done;
+ /* See if an alias exists for the domain provided */
+ if ((alias = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "domain_alias", domain_name))) {
+ snprintf(id, sizeof(id), "%s@%s", endpoint_name, alias->domain);
+ if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
+ goto done;
+ }
+ }
+
+ /* See if the transport this came in on has a provided domain */
+ if ((transport_states = ast_sip_get_transport_states())
+ && (transport_state = ao2_callback(transport_states, 0, find_transport_state_in_use, rdata))
+ && (transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport", transport_state->id))
+ && !ast_strlen_zero(transport->domain)) {
+ snprintf(id, sizeof(id), "anonymous@%s", transport->domain);
+ if ((endpoint = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "endpoint", id))) {
+ goto done;
+ }
}
}