[Asterisk-cvs] asterisk/channels chan_agent.c, 1.92, 1.93 chan_phone.c, 1.37, 1.38 chan_zap.c, 1.383, 1.384

[markster at lists.digium.com]

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

Modified Files:
	chan_agent.c chan_phone.c chan_zap.c 
Log Message:
Big diet for struct ast_channel


Index: chan_agent.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_agent.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- chan_agent.c	1 Dec 2004 05:00:29 -0000	1.92
+++ chan_agent.c	7 Dec 2004 20:38:43 -0000	1.93
@@ -323,7 +323,7 @@
 	ast_mutex_lock(&p->lock); 
 	CHECK_FORMATS(ast, p);
 	if (p->chan) {
-		p->chan->exception = ast->exception;
+		ast_copy_flags(p->chan, ast, AST_FLAG_EXCEPTION);
 		if (ast->fdno == AST_MAX_FDS - 3)
 			p->chan->fdno = AST_MAX_FDS - 2;
 		else
@@ -819,7 +819,7 @@
 		p->owning_app = pthread_self();
 		/* After the above step, there should not be any blockers. */
 		if (p->chan) {
-			if (p->chan->blocking) {
+			if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) {
 				ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" );
 				CRASH;
 			}
@@ -1003,7 +1003,7 @@
 				/* Go ahead and mark the channel as a zombie so that masquerade will
 				   destroy it for us, and we need not call ast_hangup */
 				ast_mutex_lock(&parent->lock);
-				chan->zombie = 1;
+				ast_set_flag(chan, AST_FLAG_ZOMBIE);
 				ast_channel_masquerade(parent, chan);
 				ast_mutex_unlock(&parent->lock);
 				p->abouttograb = 0;

Index: chan_phone.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_phone.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- chan_phone.c	11 Nov 2004 14:58:57 -0000	1.37
+++ chan_phone.c	7 Dec 2004 20:38:43 -0000	1.38
@@ -434,7 +434,7 @@
 	/* Try to read some data... */
 	CHECK_BLOCKING(ast);
 	res = read(p->fd, p->buf, PHONE_MAX_BUF);
-	ast->blocking = 0;
+	ast_clear_flag(ast, AST_FLAG_BLOCKING);
 	if (res < 0) {
 #if 0
 		if (errno == EAGAIN) {

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.383
retrieving revision 1.384
diff -u -d -r1.383 -r1.384
--- chan_zap.c	1 Dec 2004 18:44:52 -0000	1.383
+++ chan_zap.c	7 Dec 2004 20:38:43 -0000	1.384
@@ -3995,7 +3995,7 @@
 	readbuf = ((unsigned char *)p->subs[index].buffer) + AST_FRIENDLY_OFFSET;
 	CHECK_BLOCKING(ast);
 	res = read(p->subs[index].zfd, readbuf, p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE);
-	ast->blocking = 0;
+	ast_clear_flag(ast, AST_FLAG_BLOCKING);
 	/* Check for hangup */
 	if (res < 0) {
 		f = NULL;
@@ -4172,7 +4172,7 @@
 
 	/* If we have a fake_event, trigger exception to handle it */
 	if (p->fake_event)
-		ast->exception = 1;
+		ast_set_flag(ast, AST_FLAG_EXCEPTION);
 
 	ast_mutex_unlock(&p->lock);
 	return f;