- Use systemname for realm in sip, if we have no configuration for realm

- Optionally send systemname in manager (cool when you have a manager proxy)
- Use systemname in CLI prompt


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26884 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 9 insertions, 0 deletions

diff --git a/manager.c b/manager.c
index d096c0689..0a6b79469 100644
--- a/manager.c
+++ b/manager.c
@@ -158,6 +158,7 @@ static struct mansession {
 	char inbuf[AST_MAX_MANHEADER_LEN];
 	int inlen;
 	int send_events;
+	int displaysystemname;		/*!< Add system name to manager responses and events */
 	/* Queued events that we've not had the ability to send yet */
 	struct eventqent *eventq;
 	/* Timeout for ast_carefulwrite() */
@@ -772,6 +773,14 @@ static int authenticate(struct mansession *s, struct message *m)
 				while (v) {
 					if (!strcasecmp(v->name, "secret")) {
 						password = v->value;
+					} else if (!strcasecmp(v->name, "displaysystemname")) {
+						if (ast_true(v->value)) {
+							if (ast_strlen_zero(ast_config_AST_SYSTEM_NAME)) {
+								s->displaysystemname = 1;
+							} else {
+								ast_log(LOG_ERROR, "Can't enable displaysystemname in manager.conf - no system name configured in asterisk.conf\n");
+							}
+						}
 					} else if (!strcasecmp(v->name, "permit") ||
 						   !strcasecmp(v->name, "deny")) {
 						ha = ast_append_ha(v->name, v->value, ha);