[asterisk-commits] branch oej/03-sipit-labs r22311 - in /team/oej/03-sipit-labs: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Apr 24 15:08:57 2006
New Revision: 22311

URL: http://svn.digium.com/view/asterisk?rev=22311&view=rev
Log:
Update, add stuff

Modified:
    team/oej/03-sipit-labs/   (props changed)
    team/oej/03-sipit-labs/channels/chan_sip.c
    team/oej/03-sipit-labs/rtp.c

Propchange: team/oej/03-sipit-labs/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Modified: team/oej/03-sipit-labs/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/03-sipit-labs/channels/chan_sip.c?rev=22311&r1=22310&r2=22311&view=diff
==============================================================================
--- team/oej/03-sipit-labs/channels/chan_sip.c (original)
+++ team/oej/03-sipit-labs/channels/chan_sip.c Mon Apr 24 15:08:57 2006
@@ -8903,7 +8903,7 @@
 			ast_cli(fd, "  Non-Codec Capability:   %d\n", cur->noncodeccapability);
 			ast_cli(fd, "  Their Codec Capability:   %d\n", cur->peercapability);
 			ast_cli(fd, "  Joint Codec Capability:   %d\n", cur->jointcapability);
-			ast_cli(fd, "  Format                  %s\n", ast_getformatname(cur->owner ? cur->owner->nativeformats : 0) );
+			ast_cli(fd, "  Format                  %s\n", ast_getformatname_multiple(cur->owner ? cur->owner->nativeformats : 0) );
 			ast_cli(fd, "  Theoretical Address:    %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), cur->sa.sin_addr), ntohs(cur->sa.sin_port));
 			ast_cli(fd, "  Received Address:       %s:%d\n", ast_inet_ntoa(iabuf, sizeof(iabuf), cur->recv.sin_addr), ntohs(cur->recv.sin_port));
 			ast_cli(fd, "  SIP Transfer mode:      %s\n", transfermode2str(cur->allowtransfer));

Modified: team/oej/03-sipit-labs/rtp.c
URL: http://svn.digium.com/view/asterisk/team/oej/03-sipit-labs/rtp.c?rev=22311&r1=22310&r2=22311&view=diff
==============================================================================
--- team/oej/03-sipit-labs/rtp.c (original)
+++ team/oej/03-sipit-labs/rtp.c Mon Apr 24 15:08:57 2006
@@ -492,10 +492,19 @@
 	}
 	
 	if (ext) {
+		int profile;
 		/* RTP Extension present */
 		hdrlen += 4;
 		hdrlen += (ntohl(rtpheader[3]) & 0xffff) << 2;
-	}
+		profile = (ntohl(rtpheader[3]) & 0xffff0000) ;
+		if (profile == 0x505a)
+			ast_log(LOG_DEBUG, "Found Zfone extension in RTP stream - zrtp");
+		else
+			ast_log(LOG_DEBUG, "Found RTP Extension %d\n");
+
+		
+	}
+	
 
 	if (res < hdrlen) {
 		ast_log(LOG_WARNING, "RTP Read too short (%d, expecting %d)\n", res, hdrlen);