From c9855763c3efb0a076affefe50c4561732c837fb Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 10 Sep 2019 11:05:38 +0200
Subject: [PATCH] remote: always close the fd in connect_fd

Not closing the fd causes leaks in existing apps. It's probably better
to always close it and let apps deal with that by using dup or similar.

Make gst sink and source dup the fd before connect_fd().

Fixes #181
---
 src/gst/gstpipewiresink.c | 3 ++-
 src/gst/gstpipewiresrc.c  | 2 +-
 src/pipewire/remote.c     | 2 +-
 src/pipewire/remote.h     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c
index 90b10a793..562d55c52 100644
--- a/src/gst/gstpipewiresink.c
+++ b/src/gst/gstpipewiresink.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <sys/socket.h>
 
 #include "gstpipewireformat.h"
@@ -738,7 +739,7 @@ gst_pipewire_sink_open (GstPipeWireSink * pwsink)
   if (pwsink->fd == -1)
     pw_remote_connect (pwsink->remote);
   else
-    pw_remote_connect_fd (pwsink->remote, pwsink->fd);
+    pw_remote_connect_fd (pwsink->remote, dup(pwsink->fd));
 
   while (TRUE) {
     enum pw_remote_state state = pw_remote_get_state (pwsink->remote, &error);
diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c
index 442274889..1f372a810 100644
--- a/src/gst/gstpipewiresrc.c
+++ b/src/gst/gstpipewiresrc.c
@@ -984,7 +984,7 @@ gst_pipewire_src_open (GstPipeWireSrc * pwsrc)
   if (pwsrc->fd == -1)
     pw_remote_connect (pwsrc->remote);
   else
-    pw_remote_connect_fd (pwsrc->remote, pwsrc->fd);
+    pw_remote_connect_fd (pwsrc->remote, dup(pwsrc->fd));
 
   while (TRUE) {
     enum pw_remote_state state = pw_remote_get_state(pwsrc->remote, &error);
diff --git a/src/pipewire/remote.c b/src/pipewire/remote.c
index 168c1420f..2b545f791 100644
--- a/src/pipewire/remote.c
+++ b/src/pipewire/remote.c
@@ -463,7 +463,7 @@ int pw_remote_connect_fd(struct pw_remote *remote, int fd)
 
 	pw_remote_update_state(remote, PW_REMOTE_STATE_CONNECTING, NULL);
 
-	if ((res = pw_protocol_client_connect_fd(remote->conn, fd, false)) < 0) {
+	if ((res = pw_protocol_client_connect_fd(remote->conn, fd, true)) < 0) {
 		pw_remote_update_state(remote, PW_REMOTE_STATE_ERROR,
 				"connect_fd failed %s", spa_strerror(res));
 		return res;
diff --git a/src/pipewire/remote.h b/src/pipewire/remote.h
index 0cf837239..61192fb48 100644
--- a/src/pipewire/remote.h
+++ b/src/pipewire/remote.h
@@ -178,7 +178,7 @@ void pw_remote_add_listener(struct pw_remote *remote,
 int pw_remote_connect(struct pw_remote *remote);
 
 /** Connect to a remote PipeWire on the given socket \memberof pw_remote
- * \param fd the connected socket to use, the socket will not be closed
+ * \param fd the connected socket to use, the socket will be closed
  *	automatically on disconnect or error.
  * \return 0 on success, < 0 on error */
 int pw_remote_connect_fd(struct pw_remote *remote, int fd);