[Asterisk-cvs] asterisk/channels chan_iax.c,1.16,1.17 chan_iax2.c,1.54,1.55 chan_sip.c,1.205,1.206 chan_zap.c,1.115,1.116

[markster at lists.digium.com]

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

Modified Files:
	chan_iax.c chan_iax2.c chan_sip.c chan_zap.c 
Log Message:
Remove really broken MP3 stuff in favor of G.726 in the near future


Index: chan_iax.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- chan_iax.c	22 Oct 2003 02:53:39 -0000	1.16
+++ chan_iax.c	4 Nov 2003 02:40:09 -0000	1.17
@@ -104,8 +104,8 @@
 									~AST_FORMAT_ALAW) 
 /* A modem */
 #define IAX_CAPABILITY_LOWBANDWIDTH		(IAX_CAPABILITY_MEDBANDWIDTH & \
-									~AST_FORMAT_MP3 & \
-									~AST_FORMAT_ADPCM)
+									~AST_FORMAT_ADPCM & \
+									~AST_FORMAT_G726)
 
 #define IAX_CAPABILITY_LOWFREE		(IAX_CAPABILITY_LOWBANDWIDTH & \
 									 ~AST_FORMAT_G723_1)

Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- chan_iax2.c	6 Oct 2003 05:01:08 -0000	1.54
+++ chan_iax2.c	4 Nov 2003 02:40:09 -0000	1.55
@@ -122,7 +122,7 @@
 									~AST_FORMAT_ALAW) 
 /* A modem */
 #define IAX_CAPABILITY_LOWBANDWIDTH		(IAX_CAPABILITY_MEDBANDWIDTH & \
-									~AST_FORMAT_MP3 & \
+									~AST_FORMAT_G726 & \
 									~AST_FORMAT_ADPCM)
 
 #define IAX_CAPABILITY_LOWFREE		(IAX_CAPABILITY_LOWBANDWIDTH & \

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- chan_sip.c	4 Nov 2003 00:34:17 -0000	1.205
+++ chan_sip.c	4 Nov 2003 02:40:09 -0000	1.206
@@ -234,6 +234,7 @@
 	char realm[256];				/* Authorization realm */
 	char nonce[256];				/* Authorization nonce */
 	char domain[256];				/* Authorization nonce */
+	char lastmsg[256];				/* Last Message sent/received */
 	int amaflags;						/* AMA Flags */
 	int pendinginvite;					/* Any pending invite */
 	int pendingbye;						/* Need to send bye after we ack? */
@@ -2241,6 +2242,8 @@
 
 	memset(req, 0, sizeof(struct sip_request));
 	
+	snprintf(p->lastmsg, sizeof(p->lastmsg), "Tx: %s", msg);
+	
 	if (!seqno) {
 		p->ocseq++;
 		seqno = p->ocseq;
@@ -2695,6 +2698,9 @@
 	char tmp[80];
 	char cid[256];
 	char *l = callerid, *n=NULL;
+
+	snprintf(p->lastmsg, sizeof(p->lastmsg), "Init: %s", cmd);
+
 	if (p->owner && p->owner->callerid) {
 		strcpy(cid, p->owner->callerid);
 		ast_callerid_parse(cid, &n, &l);
@@ -4225,6 +4231,7 @@
 			ast_cli(fd, "Our Tag:             %08d\n", cur->tag);
 			ast_cli(fd, "Their Tag:           %s\n", cur->theirtag);
 			ast_cli(fd, "Need Destroy:        %d\n", cur->needdestroy);
+			ast_cli(fd, "Last Message:        %s\n", cur->lastmsg);
 			strcpy(tmp, "");
 			if (cur->dtmfmode & SIP_DTMF_RFC2833)
 				strcat(tmp, "rfc2833 ");
@@ -4870,6 +4877,7 @@
 					*from = '\0';
 			}
 		}
+		snprintf(p->lastmsg, sizeof(p->lastmsg), "Rx: %s", cmd);
 	} else {
 		/* Response to our request -- Do some sanity checks */	
 		if (!p->initreq.headers) {

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- chan_zap.c	27 Oct 2003 17:16:08 -0000	1.115
+++ chan_zap.c	4 Nov 2003 02:40:09 -0000	1.116
@@ -1312,7 +1312,9 @@
 	struct zt_pvt *p = ast->pvt->pvt;
 	int x, res, index;
 	char *c, *n, *l;
+#ifdef ZAPATA_PRI
 	char *s;
+#endif
 	char callerid[256];
 	char dest[256];
 	strncpy(dest, rdest, sizeof(dest) - 1);