X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtcp.c;h=46289db5a859a11295afd2c66807a9c9973298e0;hb=f664fa80bc043fc6d73021710d26c28be7344f18;hp=ba724d9af52d500a058612b909ecd9af62c15262;hpb=a1631eb044d7d7509e9dcc3604d2d039498191d1;p=vlc

diff --git a/modules/stream_out/rtcp.c b/modules/stream_out/rtcp.c
index ba724d9af5..46289db5a8 100644
--- a/modules/stream_out/rtcp.c
+++ b/modules/stream_out/rtcp.c
@@ -23,16 +23,24 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_block.h>
 
 #include <vlc_network.h>
-
-
-#include <vlc_url.h>
 #include <vlc_sout.h>
+#include <vlc_fs.h>
 #include "rtp.h"
 
+#include <assert.h>
+
+#ifndef SOL_IP
+# define SOL_IP IPPROTO_IP
+#endif
+
 /*
  * NOTE on RTCP implementation:
  * - there is a single sender (us), no conferencing here! => n = sender = 1,
@@ -50,7 +58,7 @@
 struct rtcp_sender_t
 {
     size_t   length;  /* RTCP packet length */
-    uint8_t  payload[28 + 8 + (2 * 257)];
+    uint8_t  payload[28 + 8 + (2 * 257) + 8];
     int      handle;  /* RTCP socket handler */
 
     uint32_t packets; /* RTP packets sent */
@@ -60,7 +68,7 @@ struct rtcp_sender_t
 
 
 rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
-                         vlc_bool_t mux)
+                         bool mux)
 {
     rtcp_sender_t *rtcp;
     uint8_t *ptr;
@@ -74,12 +82,12 @@ rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
     if (mux)
     {
         /* RTP/RTCP mux: duplicate the socket */
-#ifndef WIN32
-        fd = dup (rtp_fd);
+#ifndef _WIN32
+        fd = vlc_dup (rtp_fd);
 #else
         WSAPROTOCOL_INFO info;
-        WSADuplicateSocket (rtp_fd, GetProcessId (), &info);
-        fd = WSASocket (info.iAddressFamily, info.iSockets, info.iProtocol,
+        WSADuplicateSocket (rtp_fd, GetCurrentProcessId (), &info);
+        fd = WSASocket (info.iAddressFamily, info.iSocketType, info.iProtocol,
                         &info, 0, 0);
 #endif
     }
@@ -95,7 +103,19 @@ rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
         sport++;
         dport++;
 
-        fd = net_OpenDgram (obj, src, sport, dst, dport, AF_UNSPEC, proto);
+        fd = net_OpenDgram (obj, src, sport, dst, dport, proto);
+        if (fd != -1)
+        {
+            /* Copy the multicast IPv4 TTL value (useless for IPv6) */
+            int ttl;
+            socklen_t len = sizeof (ttl);
+
+            if (!getsockopt (rtp_fd, SOL_IP, IP_MULTICAST_TTL, &ttl, &len))
+                setsockopt (fd, SOL_IP, IP_MULTICAST_TTL, &ttl, len);
+
+            /* Ignore all incoming RTCP-RR packets */
+            setsockopt (fd, SOL_SOCKET, SO_RCVBUF, &(int){ 0 }, sizeof (int));
+        }
     }
 
     if (fd == -1)
@@ -148,7 +168,7 @@ rtcp_sender_t *OpenRTCP (vlc_object_t *obj, int rtp_fd, int proto,
 
     while ((ptr - sdes) & 3) /* 32-bits padding */
         *ptr++ = 0;
-    SetWBE (lenptr, ptr - sdes);
+    SetWBE (lenptr, (ptr - sdes - 1) >> 2);
 
     rtcp->length = ptr - rtcp->payload;
     return rtcp;
@@ -161,16 +181,22 @@ void CloseRTCP (rtcp_sender_t *rtcp)
         return;
 
     uint8_t *ptr = rtcp->payload;
+    uint64_t now64 = NTPtime64 ();
+    SetQWBE (ptr + 8, now64); /* Update the Sender Report timestamp */
+
     /* Bye */
+    ptr += rtcp->length;
     ptr[0] = (2 << 6) | 1; /* V = 2, P = 0, SC = 1 */
     ptr[1] = 203; /* payload type: Bye */
     SetWBE (ptr + 2, 1);
-    /* SSRC is already there :) */
+    memcpy (ptr + 4, rtcp->payload + 4, 4); /* Copy SSRC from Sender Report */
+    rtcp->length += 8;
 
     /* We are THE sender, so we are more important than anybody else, so
      * we can afford not to check bandwidth constraints here. */
-    send (rtcp->handle, rtcp->payload, 8, 0);
+    send (rtcp->handle, rtcp->payload, rtcp->length, 0);
     net_Close (rtcp->handle);
+    free (rtcp);
 }