[svn-commits] russell: branch 1.6.0 r106300 - in /branches/1.6.0: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar  5 18:08:11 2008
New Revision: 106300

URL: http://svn.digium.com/view/asterisk?view=rev&rev=106300
Log:
Merged revisions 105677 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r105677 | file | 2008-03-04 12:11:38 -0600 (Tue, 04 Mar 2008) | 10 lines

Merged revisions 105676 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105676 | file | 2008-03-04 14:10:34 -0400 (Tue, 04 Mar 2008) | 2 lines

In addition to setting the marker bit let's change our ssrc so they know for sure it is a different source.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/rtp.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Wed Mar  5 18:08:11 2008
@@ -1,1 +1,1 @@
-/trunk:1-105595,105675,106036,106040,106139
+/trunk:1-105595,105675,105677,106036,106040,106139

Modified: branches/1.6.0/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/rtp.c?view=diff&rev=106300&r1=106299&r2=106300
==============================================================================
--- branches/1.6.0/main/rtp.c (original)
+++ branches/1.6.0/main/rtp.c Wed Mar  5 18:08:11 2008
@@ -2329,6 +2329,7 @@
 void ast_rtp_new_source(struct ast_rtp *rtp)
 {
 	rtp->set_marker_bit = 1;
+	rtp->ssrc = ast_random();
 	return;
 }