[asterisk-commits] config global.c: Comments and a default expression adjustment. (asterisk[14])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: config_global.c: Comments and a default expression adjustment.
......................................................................


config_global.c: Comments and a default expression adjustment.

Change-Id: Ia6a58f8c73a30da6874b3f94364dce162d6f1ad3
---
M res/res_pjsip/config_global.c
1 file changed, 9 insertions(+), 8 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Joshua Colp: Looks good to me, but someone else must approve; Verified



diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c
index 1d0c11c..281630a 100644
--- a/res/res_pjsip/config_global.c
+++ b/res/res_pjsip/config_global.c
@@ -76,21 +76,21 @@
 		/*! Realm to use in challenges before an endpoint is identified */
 		AST_STRING_FIELD(default_realm);
 	);
-	/* Value to put in Max-Forwards header */
+	/*! Value to put in Max-Forwards header */
 	unsigned int max_forwards;
-	/* The interval at which to send keep alive messages to active connection-oriented transports */
+	/*! The interval at which to send keep alive messages to active connection-oriented transports */
 	unsigned int keep_alive_interval;
-	/* The maximum time for all contacts to be qualified at startup */
+	/*! The maximum time for all contacts to be qualified at startup */
 	unsigned int max_initial_qualify_time;
-	/* The interval at which to check for expired contacts */
+	/*! 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;
-	/* The maximum number of unidentified requests per source IP address before a security event is logged */
+	/*! The maximum number of unidentified requests per source IP address before a security event is logged */
 	unsigned int unidentified_request_count;
-	/* The period during which unidentified requests are accumulated */
+	/*! The period during which unidentified requests are accumulated */
 	unsigned int unidentified_request_period;
-	/* Interval at which expired unidentifed requests will be pruned */
+	/*! Interval at which expired unidentifed requests will be pruned */
 	unsigned int unidentified_request_prune_interval;
 	struct {
 		/*! Taskprocessor high water alert trigger level */
@@ -510,7 +510,8 @@
 	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",
+	ast_sorcery_object_field_register(sorcery, "global", "disable_multi_domain",
+		DEFAULT_DISABLE_MULTI_DOMAIN ? "yes" : "no",
 		OPT_BOOL_T, 1, FLDSET(struct global_config, disable_multi_domain));
 	ast_sorcery_object_field_register(sorcery, "global", "unidentified_request_count",
 		__stringify(DEFAULT_UNIDENTIFIED_REQUEST_COUNT),

-- 
To view, visit https://gerrit.asterisk.org/3802
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6a58f8c73a30da6874b3f94364dce162d6f1ad3
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: Richard Mudgett <rmudgett at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>