[Asterisk-cvs] asterisk/channels chan_iax2.c,1.96,1.97

[markster at lists.digium.com]

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

Modified Files:
	chan_iax2.c 
Log Message:
Cleanups to recent changes


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- chan_iax2.c	17 Feb 2004 22:16:14 -0000	1.96
+++ chan_iax2.c	18 Feb 2004 04:52:56 -0000	1.97
@@ -1924,7 +1924,6 @@
 
 static int iax2_hangup(struct ast_channel *c) 
 {
-	struct chan_iax2_pvt *pvt = c->pvt->pvt;
 	unsigned short callno = PTR_TO_CALLNO(c->pvt->pvt);
 	int alreadygone;
 	ast_mutex_lock(&iaxsl[callno]);
@@ -1932,7 +1931,7 @@
 		ast_log(LOG_DEBUG, "We're hanging up %s now...\n", c->name);
 		alreadygone = iaxs[callno]->alreadygone;
 		/* Send the hangup unless we have had a transmission error or are already gone */
-		if (!pvt->error && !alreadygone) 
+		if (!iaxs[callno]->error && !alreadygone) 
 			send_command_final(iaxs[callno], AST_FRAME_IAX, IAX_COMMAND_HANGUP, 0, NULL, 0, -1);
 		/* Explicitly predestroy it */
 		iax2_predestroy_nolock(callno);
@@ -2235,7 +2234,7 @@
 		tmp->nativeformats = capability;
 		tmp->readformat = 0;
 		tmp->writeformat = 0;
-		tmp->pvt->pvt = i;
+		tmp->pvt->pvt = CALLNO_TO_PTR(i->callno);
 		tmp->pvt->send_digit = iax2_digit;
 		tmp->pvt->send_text = iax2_sendtext;
 		tmp->pvt->send_image = iax2_sendimage;