[Sumover-dev] [svn commit] r4486 - vic/branches/cc/rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Wed Jul 22 15:18:25 2009
New Revision: 4486

Modified:
   vic/branches/cc/rtp/source.cpp

Log:
This was done by Piers O'Hanlon.

Make sure that do not discard the very first two data packets. 

This is because Vic-cc will not clock packets out if the sender doesn't hear 
from the receiver.  I.e., if the receiver discard the very first data packet, 
then the sender is not likely send the second data packet.


Modified: vic/branches/cc/rtp/source.cpp
==============================================================================
--- vic/branches/cc/rtp/source.cpp	(original)
+++ vic/branches/cc/rtp/source.cpp	Wed Jul 22 15:18:25 2009
@@ -1084,11 +1084,11 @@
 	} else {
 		Source::Layer& sl = s->layer(layer);
 		/*
-		* check for a srcid conflict or loop:
-		*  - believe the new guy if the old guy said he's done.
-		*  - otherwise, don't believe the new guy if we've heard
-		*    from the old guy 'recently'.
-		*/
+		 * check for a srcid conflict or loop:
+		 *  - believe the new guy if the old guy said he's done.
+		 *  - otherwise, don't believe the new guy if we've heard
+		 *    from the old guy 'recently'.
+		 */
 		if (!(s->addr() == addr)) {
 			//?#ifdef notdef
 			u_int32_t t = s->lts_done().tv_sec;
@@ -1110,16 +1110,16 @@
 		}
 		if (sl.np() == 0 && sl.nb() == 0) {
 		/*
-		* make sure we get 2 in-seq packets before
-		* accepting source.
-			*/
+		 * make sure we get 2 in-seq packets before
+		 * accepting source.
+		 */
 			//			if ((u_int32_t)((u_int32_t)seq - s->cs() + 31) > 63) {
 			if ((u_int32_t)((u_int32_t)seq - sl.cs() + 31) > 63) {
 				//				s->fs(seq);
 				sl.fs(seq);
 				//				s->cs(seq);
 				sl.cs(seq, s);
-				return (0);
+				//				return (0);
 			}
 		}
 	}