Changeset 5b8e4c0b86f93f09b2d876a97a578fa69483d008

Timestamp:

11/02/07 10:32:56 (2 years ago)

Author:

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

git-committer:

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

git-parent:

[6bf818a2c35c0fbdfc4f3bbf8d8a45a873198ce7]

git-author:

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

Message:

Fix link-scoped IPv6 addresses

Files:

• src/stream_output/sdp.c (modified) (4 diffs)

src/stream_output/sdp.c

@@ -39 +39 @@
-        return NULL;
-
-    const char *ttl = NULL;
-    strcpy (buf, "IN IP* ");
+
+    if (vlc_getnameinfo (addr, addrlen, buf + 7, MAXSDPADDRESS - 7, NULL,
+                         NI_NUMERICHOST))
+        return NULL;
-
-    switch (addr->sa_family)
@@ -47 +50 @@
-        {
-            if (net_SockAddrIsMulticast (addr, addrlen))
-ttl = "/255"
+strcat (buf, "/255")
-            buf[5] = '4';
-            break;
@@ -54 +57 @@
-#ifdef AF_INET6
-        case AF_INET6:
+        {
+            char *ptr = strchr (buf, '%');
+            if (ptr != NULL)
+                *ptr = '\0'; // remove scope ID
-            buf[5] = '6';
-            break;
+        }
-#endif
-
@@ -61 +69 @@
-            return NULL;
-    }
-
-    if (vlc_getnameinfo (addr, addrlen, buf + 7, MAXSDPADDRESS - 7, NULL,
-                         NI_NUMERICHOST))
-        return NULL;
-
-    if (ttl != NULL)
-        strcat (buf, ttl);
-
-    return buf;