[Asterisk-cvs] asterisk/channels chan_mgcp.c, 1.85, 1.86 chan_sip.c, 1.531, 1.532

[markster at lists.digium.com]

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

Modified Files:
	chan_mgcp.c chan_sip.c 
Log Message:
Fix MGCP build, SIP should destroy on temponly, not on show peer


Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- chan_mgcp.c	11 Oct 2004 03:36:43 -0000	1.85
+++ chan_mgcp.c	12 Oct 2004 21:51:08 -0000	1.86
@@ -1951,7 +1951,7 @@
 	add_header(&resp, "X", sub->txident);
 	add_header(&resp, "I", sub->cxident);
 	/*add_header(&resp, "S", "");*/
-	ast_rtp_offered_from_local(rtp, 0);
+	ast_rtp_offered_from_local(sub->rtp, 0);
 	add_sdp(&resp, sub, rtp);
     /* SC: fill in new fields */
     resp.cmd = MGCP_CMD_MDCX;
@@ -1985,7 +1985,7 @@
     /* SC: X header should not be sent. kept for compatibility */
 	add_header(&resp, "X", sub->txident);
 	/*add_header(&resp, "S", "");*/
-	ast_rtp_offered_from_local(rtp, 1);
+	ast_rtp_offered_from_local(sub->rtp, 1);
 	add_sdp(&resp, sub, rtp);
     /* SC: fill in new fields */
     resp.cmd = MGCP_CMD_CRCX;

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -d -r1.531 -r1.532
--- chan_sip.c	12 Oct 2004 19:54:54 -0000	1.531
+++ chan_sip.c	12 Oct 2004 21:51:08 -0000	1.532
@@ -5749,7 +5749,7 @@
 
 	ast_mutex_unlock(&peerl.lock);
 
-	if (peer && peer->dynamic) {
+	if (peer && peer->temponly) {
 		destroy_peer(peer);
 	}
 	return RESULT_SUCCESS;