[Asterisk-cvs] asterisk/channels chan_sip.c, 1.477, 1.478 chan_mgcp.c, 1.75, 1.76

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c chan_mgcp.c 
Log Message:
Repair offer/answer model (bug #2293), initial CNG work for new frametype


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.477
retrieving revision 1.478
diff -u -d -r1.477 -r1.478
--- chan_sip.c	23 Aug 2004 14:31:20 -0000	1.477
+++ chan_sip.c	26 Aug 2004 04:56:26 -0000	1.478
@@ -3511,6 +3511,7 @@
 		return -1;
 	}
 	respprep(&resp, p, msg, req);
+	ast_rtp_offered_from_local(p->rtp, 0);
 	add_sdp(&resp, p);
 	return send_response(p, &resp, retrans, seqno);
 }
@@ -3587,6 +3588,7 @@
 		reqprep(&req, p, "INVITE", 0, 1);
 	
 	add_header(&req, "Allow", ALLOWED_METHODS);
+	ast_rtp_offered_from_local(p->rtp, 1);
 	add_sdp(&req, p);
 	/* Use this as the basis */
 	copy_request(&p->initreq, &req);
@@ -3745,6 +3747,7 @@
 	}
 	add_header(&req, "Allow", ALLOWED_METHODS);
 	if (sdp) {
+		ast_rtp_offered_from_local(p->rtp, 1);
 		add_sdp(&req, p);
 	} else {
 		add_header(&req, "Content-Length", "0");

Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- chan_mgcp.c	13 Aug 2004 13:19:29 -0000	1.75
+++ chan_mgcp.c	26 Aug 2004 04:56:26 -0000	1.76
@@ -1945,6 +1945,7 @@
 	add_header(&resp, "X", sub->txident);
 	add_header(&resp, "I", sub->cxident);
 	/*add_header(&resp, "S", "");*/
+	ast_rtp_offered_from_local(rtp, 0);
 	add_sdp(&resp, sub, rtp);
     /* SC: fill in new fields */
     resp.cmd = MGCP_CMD_MDCX;
@@ -1978,6 +1979,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);
 	add_sdp(&resp, sub, rtp);
     /* SC: fill in new fields */
     resp.cmd = MGCP_CMD_CRCX;