[Asterisk-cvs] asterisk/channels chan_zap.c,1.147,1.148

[martinp at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv4041/channels

Modified Files:
	chan_zap.c 
Log Message:
Fix the ZapHangup, ZapDialOffhook, ZapTransfer manager commands


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- chan_zap.c	2 Dec 2003 23:09:04 -0000	1.147
+++ chan_zap.c	4 Dec 2003 00:03:08 -0000	1.148
@@ -6853,10 +6853,6 @@
 		return 0;
 	}
 	p = find_channel(atoi(channel));
-	if (p->owner && p->owner->_state != AST_STATE_UP) {
-		astman_send_error(s, m, "Channel is on hook");
-		return 0;
-	}
 	if (!p) {
 		astman_send_error(s, m, "No such channel");
 		return 0;
@@ -6875,10 +6871,6 @@
 		return 0;
 	}
 	p = find_channel(atoi(channel));
-	if (p->owner && p->owner->_state != AST_STATE_UP) {
-		astman_send_error(s, m, "Channel is on hook");
-		return 0;
-	}
 	if (!p) {
 		astman_send_error(s, m, "No such channel");
 		return 0;
@@ -6903,12 +6895,7 @@
 		return 0;
 	}
 	p = find_channel(atoi(channel));
-	if (p->owner) {
-		if (p->owner->_state != AST_STATE_UP) {
-			astman_send_error(s, m, "Channel is on hook");
-			return 0;
-		}
-	} else {
+	if (!p->owner) {
 		astman_send_error(s, m, "Channel does not have it's owner");
 		return 0;
 	}