From: Joshua Colp <jcolp@digium.com>
Date: Sat, 27 Jan 2007 00:44:51 +0000 (+0000)
Subject: Have the manager interface send back an "Already logged in" message instead of "Inval... 
X-Git-Tag: 1.4.1~201
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c289fe01b2e76134a7e896fa51f7fafe71a3b2a;p=thirdparty%2Fasterisk.git

Have the manager interface send back an "Already logged in" message instead of "Invalid/Unknown Command" when the client authenticates for a second time. (issue #8509 reported by pari)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@52373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index b92226539b..358634e94d 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2021,22 +2021,29 @@ static int process_message(struct mansession *s, const struct message *m)
 		} else
 			astman_send_error(s, m, "Authentication Required");
 	} else {
-		ast_mutex_lock(&actionlock);
-		for (tmp = first_action; tmp; tmp = tmp->next) { 		
-			if (strcasecmp(action, tmp->action))
-				continue;
+		if (!strcasecmp(action, "Login")) {
 			ast_mutex_lock(&s->__lock);
-			if ((s->writeperm & tmp->authority) == tmp->authority) {
-				if (tmp->func(s, m))
-					ret = -1;
-			} else
-				astman_send_error(s, m, "Permission denied");
+			astman_send_ack(s, m, "Already logged in");
 			ast_mutex_unlock(&s->__lock);
-			break;
+		} else {
+			ast_mutex_lock(&actionlock);
+			for (tmp = first_action; tmp; tmp = tmp->next) { 		
+				if (strcasecmp(action, tmp->action))
+					continue;
+				ast_mutex_lock(&s->__lock);
+				if ((s->writeperm & tmp->authority) == tmp->authority) {
+					if (tmp->func(s, m))
+						ret = -1;
+				} else
+					astman_send_error(s, m, "Permission denied");
+				ast_mutex_unlock(&s->__lock);
+				break;
+			}
+			
+			ast_mutex_unlock(&actionlock);
+			if (!tmp)
+				astman_send_error(s, m, "Invalid/unknown command");
 		}
-		ast_mutex_unlock(&actionlock);
-		if (!tmp)
-			astman_send_error(s, m, "Invalid/unknown command");
 	}
 	if (ret)
 		return ret;