From c95952f0b2f085fa19451505241c81ebb90c081f Mon Sep 17 00:00:00 2001 From: boris Date: Fri, 29 Aug 2014 08:27:42 +0000 Subject: [PATCH] More thorough checks for RTP packets, make sure that no false-positives come from DTLS for example (fix inaccurate loss calculations and "RTP loss >5%" messages being logged). --- .../socket/DelegatingDatagramSocket.java | 32 ++++++++++++++++--- .../ice4j/socket/RtcpDemuxPacketFilter.java | 14 +++++++- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/src/org/ice4j/socket/DelegatingDatagramSocket.java b/src/org/ice4j/socket/DelegatingDatagramSocket.java index 9684563..438b58c 100644 --- a/src/org/ice4j/socket/DelegatingDatagramSocket.java +++ b/src/org/ice4j/socket/DelegatingDatagramSocket.java @@ -640,7 +640,7 @@ public class DelegatingDatagramSocket // no exception packet is successfully received, log it. // If this is not a STUN/TURN packet, then this is a RTP packet. - if(!StunDatagramPacketFilter.isStunPacket(p)) + if(isRtpPacket(p)) { ++nbReceivedRtpPackets; } @@ -980,7 +980,7 @@ public class DelegatingDatagramSocket public void updateRtpLosses(DatagramPacket p) { // If this is not a STUN/TURN packet, then this is a RTP packet. - if(!StunDatagramPacketFilter.isStunPacket(p)) + if(isRtpPacket(p)) { long newSeq = getRtpSequenceNumber(p); if(this.lastRtpSequenceNumber != -1) @@ -1004,7 +1004,7 @@ public class DelegatingDatagramSocket * @param totalNbLost The total number of lost packet since the beginning of * this stream. * @param totalNbReceived The total number of received packet since the - * begnining of this tream. + * beginning of this stream. * @param lastLogTime The last time we have logged information about RTP * losses. * @@ -1082,7 +1082,7 @@ public class DelegatingDatagramSocket * DelegatingDatagramSocket#setDefaultReceiveBufferSize() won't * automatically be applied to sockets obtain from the factory. * - * @param factory The factory asigned to generates the new DatagramSocket + * @param factory The factory assigned to generates the new DatagramSocket * for each new DelegatingDatagramSocket which do not use a delegate socket. */ public static void setDefaultDelegateFactory(DatagramSocketFactory factory) @@ -1126,4 +1126,28 @@ public class DelegatingDatagramSocket super.setReceiveBufferSize(defaultReceiveBufferSize); } } + + /** + * Determines whether p is an RTP packet (and something else, like, + * a STUN, RTCP or DTLS packet). + * @param p the packet. + * @return true if p appears to be an RTP packet. + */ + private boolean isRtpPacket(DatagramPacket p) + { + byte[] data = p.getData(); + int off = p.getOffset(); + int len = p.getLength(); + + if (len >= 4) + { + if (((data[off + 0] & 0xc0) >> 6) == 2) + { + //Either RTP or RTCP + return !RtcpDemuxPacketFilter.isRtcpPacket(p); + } + } + + return false; + } } diff --git a/src/org/ice4j/socket/RtcpDemuxPacketFilter.java b/src/org/ice4j/socket/RtcpDemuxPacketFilter.java index 145c716..e62e91d 100644 --- a/src/org/ice4j/socket/RtcpDemuxPacketFilter.java +++ b/src/org/ice4j/socket/RtcpDemuxPacketFilter.java @@ -46,7 +46,7 @@ public class RtcpDemuxPacketFilter * @return true if p is an RTCP and this filter accepts it * and false otherwise. */ - public boolean accept(DatagramPacket p) + public static boolean isRtcpPacket(DatagramPacket p) { int len = p.getLength(); if (len >= 4) //minimum RTCP message length @@ -63,4 +63,16 @@ public class RtcpDemuxPacketFilter return false; } + + /** + * Returns true if this RtcpDemuxPacketFilter should + * accept p, that is, if p looks like an RTCP packet. + * See {@link #isRtcpPacket(java.net.DatagramPacket)} + * @return true if p looks like an RTCP packet. + */ + public boolean accept(DatagramPacket p) + { + return isRtcpPacket(p); + } + }