[farsight2/master] Don't emit the UNKWOWN_CNAME error anymore

[Olivier Crête]

---
 gst-libs/gst/farsight/fs-conference-iface.h |    2 +-
 gst/fsrtpconference/fs-rtp-session.c        |   15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-conference-iface.h b/gst-libs/gst/farsight/fs-conference-iface.h
index 6475549..9399def 100644
--- a/gst-libs/gst/farsight/fs-conference-iface.h
+++ b/gst-libs/gst/farsight/fs-conference-iface.h
@@ -99,7 +99,7 @@ GType fs_conference_get_type (void);
  * likely denotes an error on the remote side, the buffers will be ignored.
  * It can safely be ignored in most cases (but may result in a call with no
  * media received).
- * @FS_ERROR_UNKNOWN_CNAME: Data was received for an unknown cname.
+ * @FS_ERROR_UNKNOWN_CNAME: Data was received for an unknown cname (DEPRECATED).
  * @FS_ERROR_NO_CODECS: There are no codecs detected for that media type.
  * @FS_ERROR_NO_CODECS_LEFT: All of the codecs have been disabled by the
  * codec preferences, one should try less strict codec preferences.
diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
index ecc286b..beae4e5 100644
--- a/gst/fsrtpconference/fs-rtp-session.c
+++ b/gst/fsrtpconference/fs-rtp-session.c
@@ -3674,6 +3674,14 @@ fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
     return;
 
   FS_RTP_SESSION_LOCK (session);
+
+  if (!session->priv->free_substreams)
+  {
+    FS_RTP_SESSION_UNLOCK (session);
+    fs_rtp_session_has_disposed_exit (session);
+    return;
+  }
+
   for (item = g_list_first (session->priv->streams);
        item;
        item = g_list_next (item))
@@ -3696,12 +3704,9 @@ fs_rtp_session_associate_ssrc_cname (FsRtpSession *session,
 
   if (!stream)
   {
-    gchar *str = g_strdup_printf ("There is no particpant with cname %s for"
-        " ssrc %u", cname, ssrc);
+    GST_LOG ("There is no participant with cname %s, but"
+        " we have streams of unknown origin", cname);
     FS_RTP_SESSION_UNLOCK (session);
-    fs_session_emit_error (FS_SESSION (session), FS_ERROR_UNKNOWN_CNAME,
-        str, str);
-    g_free (str);
     fs_rtp_session_has_disposed_exit (session);
     return;
   }
-- 
1.5.6.5