Commit 76a959a5 authored by Max Kellermann's avatar Max Kellermann

rtsp_client, output/raop: use close_socket() instead of close()

parent f43873dc
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "raop_output_plugin.h" #include "raop_output_plugin.h"
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "mixer_list.h"
#include "raop_output_plugin.h" #include "fd_util.h"
#include "ntp_server.h" #include "ntp_server.h"
#include "rtsp_client.h" #include "rtsp_client.h"
#include "glib_compat.h" #include "glib_compat.h"
...@@ -162,10 +162,10 @@ raop_session_free(struct raop_session_data *session) ...@@ -162,10 +162,10 @@ raop_session_free(struct raop_session_data *session)
g_mutex_free(session->list_mutex); g_mutex_free(session->list_mutex);
if (raop_session->data_fd >= 0) if (raop_session->data_fd >= 0)
close(raop_session->data_fd); close_socket(raop_session->data_fd);
if (raop_session->ctrl.fd >= 0) if (raop_session->ctrl.fd >= 0)
close(raop_session->ctrl.fd); close_socket(raop_session->ctrl.fd);
g_free(session); g_free(session);
} }
...@@ -345,7 +345,7 @@ open_udp_socket(char *hostname, unsigned short *port, ...@@ -345,7 +345,7 @@ open_udp_socket(char *hostname, unsigned short *port,
return -1; return -1;
} }
if (bind_host(sd, hostname, 0, port, error_r)) { if (bind_host(sd, hostname, 0, port, error_r)) {
close(sd); close_socket(sd);
return -1; return -1;
} }
......
...@@ -21,8 +21,10 @@ ...@@ -21,8 +21,10 @@
* Based on the RTSP client by Shiro Ninomiya <shiron@snino.com> * Based on the RTSP client by Shiro Ninomiya <shiron@snino.com>
*/ */
#include "config.h"
#include "rtsp_client.h" #include "rtsp_client.h"
#include "tcp_socket.h" #include "tcp_socket.h"
#include "fd_util.h"
#include "glib_compat.h" #include "glib_compat.h"
#include <assert.h> #include <assert.h>
...@@ -164,7 +166,7 @@ open_tcp_socket(char *hostname, unsigned short *port, ...@@ -164,7 +166,7 @@ open_tcp_socket(char *hostname, unsigned short *port,
return -1; return -1;
} }
if (bind_host(sd, hostname, 0, port, error_r)) { if (bind_host(sd, hostname, 0, port, error_r)) {
close(sd); close_socket(sd);
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment