From: Luigi Rizzo <rizzo@icir.org>
Date: Tue, 28 Nov 2006 09:39:16 +0000 (+0000)
Subject: another normalization of AMI vs HTTP identification.
X-Git-Tag: 1.6.0-beta1~3^2~3853
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e94283179b1af3a03c18641c3a1e1494b9b7b4;p=thirdparty%2Fasterisk.git

another normalization of AMI vs HTTP identification.
Should really define a macro IS_AMI(s) so it is clear what
we want to do.



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

diff --git a/main/manager.c b/main/manager.c
index 4b0f87e458..5a852bfbec 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -1149,7 +1149,7 @@ static int action_waitevent(struct mansession *s, struct message *m)
 		ast_mutex_unlock(&s->__lock);
 		if (needexit)
 			break;
-		if (!s->inuse && s->fd > 0) {	/* AMI session */
+		if (s->managerid == 0) {	/* AMI session */
 			if (ast_wait_for_input(s->fd, 1000))
 				break;
 		} else {	/* HTTP session */