Changeset 02859f76a72ee583ed6d77953b0651e8364504b7

Timestamp:

10/02/07 22:32:28 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1171143148 +0000

git-parent:

[fe1670bd6436b85002b873bcd8ec69081c4b768a]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1171143148 +0000

Message:

Repair SAP + SSM

Files:

• src/stream_output/sap.c (modified) (4 diffs)
• src/stream_output/sdp.c (modified) (4 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

src/stream_output/sap.c

@@ -322 +322 @@
-            }
-
-            /* FIXME FIXME FIXME */
-            if( ipv4 == 0 )
-            {
@@ -601 +600 @@
-
-     char *head = StartSDP (p_session->psz_name, p_session->description,
-
+ b_ssm,
-        (const struct sockaddr *)&p_session->orig, p_session->origlen,
-        (const struct sockaddr *)&p_session->addr, p_session->addrlen);
@@ -614 +613 @@
-     || (asprintf (&plgroup, "a=x-plgroup:%s\r\n", psz_group) == -1))
-        plgroup = NULL;
-
-    char *sfilter;
-#if 0
-    if ((!b_ssm)
-     || (asprintf (&sfilter, "a=source-filter: incl IN IP%c * %s\r\n",
-                   ipv, p_addr->psz_machine) == -1))
-#else
-# warning FIXME: repair Source Specific Multicast
-#endif
-        sfilter = NULL;
-
-    const char *comedia = NULL;
@@ -631 +620 @@
-                  "a=connection:new\r\n";
-
- "%s"
+
-                        "m=video %d %s\r\n",
-                        head,
-                        plgroup ?: "",
-                        sfilter ?: "",
-                        comedia ?: "",
-                        net_GetPort ((const struct sockaddr *)&p_session->addr),
-                        p_session->sdpformat);
-    free (plgroup);
-    free (sfilter);
-
-    if (res == -1)

src/stream_output/sdp.c

@@ -86 +86 @@
-
-char *StartSDP (const char *name, const char *description, const char *url,
-
+ vlc_bool_t ssm,
-                const struct sockaddr *orig, socklen_t origlen,
-                const struct sockaddr *addr, socklen_t addrlen)
-{
-    uint64_t t = NTPtime64 ();
-
+
+
-    const char *preurl = "\r\nu=", *premail = "\r\ne=", *prephone = "\r\np=";
-
@@ -111 +112 @@
-        return NULL;
-
+    if (ssm)
+        sprintf (sfilter, "\r\na=source-filter: incl IN IP%c * %s",
+                 machine[5], machine + 7);
+    else
+        *sfilter = '\0';
+
-    if (asprintf (&sdp, "v=0"
-                    "\r\no=- "I64Fu" "I64Fu" %s"
@@ -128 +135 @@
-                    "\r\na=type:broadcast"
-                    "\r\na=charset:UTF-8"
+            "%s" // optional source filter
-                    "\r\n",
-               /* o= */ t, t, machine,
@@ -135 +143 @@
-               /* e= */ premail, email,
-               /* p= */ prephone, phone,
-
+
+
-        return NULL;
-    return sdp;

src/stream_output/stream_output.h

@@ -112 +112 @@
-
-char *StartSDP (const char *name, const char *description, const char *url,
-
+ vlc_bool_t ssm,
-                const struct sockaddr *orig, socklen_t origlen,
-                const struct sockaddr *addr, socklen_t addrlen);