mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

client: use more GIO

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=681593
This commit is contained in:
Wim Taymans 2012-09-07 17:14:30 +02:00
parent 87c73c06fb
commit 3e55e0e467
1 changed files with 11 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst/rtsp-server/rtsp-client.c
View file

@ -18,19 +18,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include <string.h> #include <string.h>
#include <sys/time.h>
#include <sys/types.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include "rtsp-client.h" #include "rtsp-client.h"
#include "rtsp-sdp.h" #include "rtsp-sdp.h"
@ -73,7 +61,7 @@ static void gst_rtsp_client_set_property (GObject * object, guint propid,
const GValue * value, GParamSpec * pspec); const GValue * value, GParamSpec * pspec);
static void gst_rtsp_client_finalize (GObject * obj); static void gst_rtsp_client_finalize (GObject * obj);
static GstSDPMessage * create_sdp (GstRTSPClient * client, GstRTSPMedia * media); static GstSDPMessage *create_sdp (GstRTSPClient * client, GstRTSPMedia * media);
static void client_session_finalized (GstRTSPClient * client, static void client_session_finalized (GstRTSPClient * client,
GstRTSPSession * session); GstRTSPSession * session);
static void unlink_session_streams (GstRTSPClient * client, static void unlink_session_streams (GstRTSPClient * client,
@ -2012,9 +2000,6 @@ attach_client (GstRTSPClient * client, GSocket * socket,
GSource *source; GSource *source;
GMainContext *context; GMainContext *context;
GstRTSPUrl *url; GstRTSPUrl *url;
struct sockaddr_storage addr;
socklen_t addrlen;
gchar ip[INET6_ADDRSTRLEN];
read_socket = gst_rtsp_connection_get_read_socket (conn); read_socket = gst_rtsp_connection_get_read_socket (conn);
client->is_ipv6 = g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6; client->is_ipv6 = g_socket_get_family (socket) == G_SOCKET_FAMILY_IPV6;
@ -2022,18 +2007,17 @@ attach_client (GstRTSPClient * client, GSocket * socket,
if (!(addres = g_socket_get_remote_address (read_socket, error))) if (!(addres = g_socket_get_remote_address (read_socket, error)))
goto no_address; goto no_address;
addrlen = sizeof (addr);
if (!g_socket_address_to_native (addres, &addr, addrlen, error))
goto native_failed;
g_object_unref (addres);
if (getnameinfo ((struct sockaddr *) &addr, addrlen, ip, sizeof (ip), NULL, 0,
NI_NUMERICHOST) != 0)
goto getnameinfo_failed;
/* keep the original ip that the client connected to */
g_free (client->server_ip); g_free (client->server_ip);
client->server_ip = g_strndup (ip, sizeof (ip)); /* keep the original ip that the client connected to */
if (G_IS_INET_SOCKET_ADDRESS (addres)) {
GInetAddress *iaddr;
iaddr = g_inet_socket_address_get_address (G_INET_SOCKET_ADDRESS (addres));
client->server_ip = g_inet_address_to_string (iaddr);
} else {
client->server_ip = g_strdup ("unknown");
}
GST_INFO ("client %p connected to server ip %s, ipv6 = %d", client, GST_INFO ("client %p connected to server ip %s, ipv6 = %d", client,
client->server_ip, client->is_ipv6); client->server_ip, client->is_ipv6);
@ -2066,17 +2050,6 @@ no_address:
GST_ERROR ("could not get remote address %s", (*error)->message); GST_ERROR ("could not get remote address %s", (*error)->message);
return FALSE; return FALSE;
} }
native_failed:
{
g_object_unref (addres);
GST_ERROR ("could not get native address %s", (*error)->message);
return FALSE;
}
getnameinfo_failed:
{
GST_ERROR ("getnameinfo failed: %s", g_strerror (errno));
return FALSE;
}
} }
/** /**