/* GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org>
+ * Copyright (C) <2011> Collabora Ltd.
+ * Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
/**
* SECTION:element-tcpclientsink
- * @see_also: #tcpclientsrc
+ * @see_also: #tcpclientsink
*
* <refsect2>
* <title>Example launch line</title>
* # server:
* nc -l -p 3000
* # client:
- * gst-launch fdsrc fd=1 ! tcpclientsink port=3000
+ * gst-launch fdsink fd=1 ! tcpclientsink port=3000
* ]| everything you type in the client is shown on the server
* </refsect2>
*/
#include "config.h"
#endif
#include <gst/gst-i18n-plugin.h>
+
#include "gsttcp.h"
#include "gsttcpclientsink.h"
-#include <string.h> /* memset */
/* TCPClientSink signals and args */
enum
enum
{
- ARG_0,
- ARG_HOST,
- ARG_PORT
+ PROP_0,
+ PROP_HOST,
+ PROP_PORT
};
static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
GstCaps * caps);
static GstFlowReturn gst_tcp_client_sink_render (GstBaseSink * bsink,
GstBuffer * buf);
-static GstStateChangeReturn gst_tcp_client_sink_change_state (GstElement *
- element, GstStateChange transition);
+static gboolean gst_tcp_client_sink_start (GstBaseSink * bsink);
+static gboolean gst_tcp_client_sink_stop (GstBaseSink * bsink);
+static gboolean gst_tcp_client_sink_unlock (GstBaseSink * bsink);
+static gboolean gst_tcp_client_sink_unlock_stop (GstBaseSink * bsink);
static void gst_tcp_client_sink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
gobject_class->get_property = gst_tcp_client_sink_get_property;
gobject_class->finalize = gst_tcp_client_sink_finalize;
- g_object_class_install_property (gobject_class, ARG_HOST,
+ g_object_class_install_property (gobject_class, PROP_HOST,
g_param_spec_string ("host", "Host", "The host/IP to send the packets to",
TCP_DEFAULT_HOST, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- g_object_class_install_property (gobject_class, ARG_PORT,
+ g_object_class_install_property (gobject_class, PROP_PORT,
g_param_spec_int ("port", "Port", "The port to send the packets to",
0, TCP_HIGHEST_PORT, TCP_DEFAULT_PORT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
"Send data as a client over the network via TCP",
"Thomas Vander Stichele <thomas at apestaart dot org>");
- gstelement_class->change_state = gst_tcp_client_sink_change_state;
-
+ gstbasesink_class->start = gst_tcp_client_sink_start;
+ gstbasesink_class->stop = gst_tcp_client_sink_stop;
gstbasesink_class->set_caps = gst_tcp_client_sink_setcaps;
gstbasesink_class->render = gst_tcp_client_sink_render;
+ gstbasesink_class->unlock = gst_tcp_client_sink_unlock;
+ gstbasesink_class->unlock_stop = gst_tcp_client_sink_unlock_stop;
GST_DEBUG_CATEGORY_INIT (tcpclientsink_debug, "tcpclientsink", 0, "TCP sink");
}
this->host = g_strdup (TCP_DEFAULT_HOST);
this->port = TCP_DEFAULT_PORT;
- this->sock_fd.fd = -1;
+ this->socket = NULL;
+ this->cancellable = g_cancellable_new ();
+
GST_OBJECT_FLAG_UNSET (this, GST_TCP_CLIENT_SINK_OPEN);
}
{
GstTCPClientSink *this = GST_TCP_CLIENT_SINK (gobject);
+ if (this->cancellable)
+ g_object_unref (this->cancellable);
+ this->cancellable = NULL;
+
+ if (this->socket)
+ g_object_unref (this->socket);
+ this->socket = NULL;
+
g_free (this->host);
+ this->host = NULL;
G_OBJECT_CLASS (parent_class)->finalize (gobject);
}
static GstFlowReturn
gst_tcp_client_sink_render (GstBaseSink * bsink, GstBuffer * buf)
{
- size_t wrote = 0;
GstTCPClientSink *sink;
guint8 *data;
- gsize size;
+ gsize size, written = 0;
+ gssize rret;
+ GError *err = NULL;
sink = GST_TCP_CLIENT_SINK (bsink);
size);
/* write buffer data */
- wrote = gst_tcp_socket_write (sink->sock_fd.fd, data, size);
+ while (written < size) {
+ rret =
+ g_socket_send (sink->socket, (gchar *) data + written, size - written,
+ sink->cancellable, &err);
+ if (rret < 0)
+ goto write_error;
+ written += rret;
+ }
gst_buffer_unmap (buf, data, size);
- if (wrote < size)
- goto write_error;
-
- sink->data_written += wrote;
+ sink->data_written += written;
return GST_FLOW_OK;
/* ERRORS */
write_error:
{
- GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
- (_("Error while sending data to \"%s:%d\"."), sink->host, sink->port),
- ("Only %" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes written: %s",
- wrote, size, g_strerror (errno)));
- return GST_FLOW_ERROR;
+ GstFlowReturn ret;
+
+ gst_buffer_unmap (buf, data, size);
+
+ if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ ret = GST_FLOW_WRONG_STATE;
+ GST_DEBUG_OBJECT (sink, "Cancelled reading from socket");
+ } else {
+ GST_ELEMENT_ERROR (sink, RESOURCE, WRITE,
+ (_("Error while sending data to \"%s:%d\"."), sink->host, sink->port),
+ ("Only %" G_GSIZE_FORMAT " of %" G_GSIZE_FORMAT " bytes written: %s",
+ written, size, err->message));
+ ret = GST_FLOW_ERROR;
+ }
+ g_clear_error (&err);
+ return ret;
}
}
tcpclientsink = GST_TCP_CLIENT_SINK (object);
switch (prop_id) {
- case ARG_HOST:
+ case PROP_HOST:
if (!g_value_get_string (value)) {
g_warning ("host property cannot be NULL");
break;
g_free (tcpclientsink->host);
tcpclientsink->host = g_strdup (g_value_get_string (value));
break;
- case ARG_PORT:
+ case PROP_PORT:
tcpclientsink->port = g_value_get_int (value);
break;
tcpclientsink = GST_TCP_CLIENT_SINK (object);
switch (prop_id) {
- case ARG_HOST:
+ case PROP_HOST:
g_value_set_string (value, tcpclientsink->host);
break;
- case ARG_PORT:
+ case PROP_PORT:
g_value_set_int (value, tcpclientsink->port);
break;
-
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
/* create a socket for sending to remote machine */
static gboolean
-gst_tcp_client_sink_start (GstTCPClientSink * this)
+gst_tcp_client_sink_start (GstBaseSink * bsink)
{
- int ret;
- gchar *ip;
+ GstTCPClientSink *this = GST_TCP_CLIENT_SINK (bsink);
+ GError *err = NULL;
+ GInetAddress *addr;
+ GSocketAddress *saddr;
if (GST_OBJECT_FLAG_IS_SET (this, GST_TCP_CLIENT_SINK_OPEN))
return TRUE;
- /* reset caps_sent flag */
- this->caps_sent = FALSE;
-
/* create sending client socket */
GST_DEBUG_OBJECT (this, "opening sending client socket to %s:%d", this->host,
this->port);
- if ((this->sock_fd.fd = socket (AF_INET, SOCK_STREAM, 0)) == -1) {
- GST_ELEMENT_ERROR (this, RESOURCE, OPEN_WRITE, (NULL), GST_ERROR_SYSTEM);
- return FALSE;
- }
- GST_DEBUG_OBJECT (this, "opened sending client socket with fd %d",
- this->sock_fd.fd);
+ this->socket =
+ g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM,
+ G_SOCKET_PROTOCOL_TCP, &err);
+ if (!this->socket)
+ goto no_socket;
+
+ GST_DEBUG_OBJECT (this, "opened sending client socket");
/* look up name if we need to */
- ip = gst_tcp_host_to_ip (GST_ELEMENT (this), this->host);
- if (!ip) {
- gst_tcp_socket_close (&this->sock_fd);
- return FALSE;
+ addr = g_inet_address_new_from_string (this->host);
+ if (!addr) {
+ GResolver *resolver = g_resolver_get_default ();
+ GList *results;
+
+ results =
+ g_resolver_lookup_by_name (resolver, this->host, this->cancellable,
+ &err);
+ if (!results)
+ goto name_resolve;
+ addr = G_INET_ADDRESS (g_object_ref (results->data));
+
+ g_resolver_free_addresses (results);
+ g_object_unref (resolver);
}
- GST_DEBUG_OBJECT (this, "IP address for host %s is %s", this->host, ip);
+#ifndef GST_DISABLE_GST_DEBUG
+ {
+ gchar *ip = g_inet_address_to_string (addr);
- /* connect to server */
- memset (&this->server_sin, 0, sizeof (this->server_sin));
- this->server_sin.sin_family = AF_INET; /* network socket */
- this->server_sin.sin_port = htons (this->port); /* on port */
- this->server_sin.sin_addr.s_addr = inet_addr (ip); /* on host ip */
- g_free (ip);
-
- GST_DEBUG_OBJECT (this, "connecting to server");
- ret = connect (this->sock_fd.fd, (struct sockaddr *) &this->server_sin,
- sizeof (this->server_sin));
-
- if (ret) {
- gst_tcp_socket_close (&this->sock_fd);
- switch (errno) {
- case ECONNREFUSED:
- GST_ELEMENT_ERROR (this, RESOURCE, OPEN_WRITE,
- (_("Connection to %s:%d refused."), this->host, this->port),
- (NULL));
- return FALSE;
- break;
- default:
- GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL),
- ("connect to %s:%d failed: %s", this->host, this->port,
- g_strerror (errno)));
- return FALSE;
- break;
- }
+ GST_DEBUG_OBJECT (this, "IP address for host %s is %s", this->host, ip);
+ g_free (ip);
}
+#endif
+
+ /* connect to server */
+ saddr = g_inet_socket_address_new (addr, this->port);
+ if (!g_socket_connect (this->socket, saddr, this->cancellable, &err))
+ goto connect_failed;
+
+ g_object_unref (saddr);
+ g_object_unref (addr);
GST_OBJECT_FLAG_SET (this, GST_TCP_CLIENT_SINK_OPEN);
this->data_written = 0;
return TRUE;
+no_socket:
+ {
+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL),
+ ("Failed to create socket: %s", err->message));
+ g_clear_error (&err);
+ return FALSE;
+ }
+name_resolve:
+ {
+ if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ GST_DEBUG_OBJECT (this, "Cancelled name resolval");
+ } else {
+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL),
+ ("Failed to resolve host '%s': %s", this->host, err->message));
+ }
+ g_clear_error (&err);
+ gst_tcp_client_sink_stop (GST_BASE_SINK (this));
+ return FALSE;
+ }
+connect_failed:
+ {
+ if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+ GST_DEBUG_OBJECT (this, "Cancelled connecting");
+ } else {
+ GST_ELEMENT_ERROR (this, RESOURCE, OPEN_READ, (NULL),
+ ("Failed to connect to host '%s:%d': %s", this->host, this->port,
+ err->message));
+ }
+ g_clear_error (&err);
+ g_object_unref (saddr);
+ g_object_unref (addr);
+ gst_tcp_client_sink_stop (GST_BASE_SINK (this));
+ return FALSE;
+ }
}
static gboolean
-gst_tcp_client_sink_stop (GstTCPClientSink * this)
+gst_tcp_client_sink_stop (GstBaseSink * bsink)
{
+ GstTCPClientSink *this = GST_TCP_CLIENT_SINK (bsink);
+ GError *err = NULL;
+
if (!GST_OBJECT_FLAG_IS_SET (this, GST_TCP_CLIENT_SINK_OPEN))
return TRUE;
- gst_tcp_socket_close (&this->sock_fd);
+ if (this->socket) {
+ GST_DEBUG_OBJECT (this, "closing socket");
+
+ if (!g_socket_close (this->socket, &err)) {
+ GST_ERROR_OBJECT (this, "Failed to close socket: %s", err->message);
+ g_clear_error (&err);
+ }
+ g_object_unref (this->socket);
+ this->socket = NULL;
+ }
GST_OBJECT_FLAG_UNSET (this, GST_TCP_CLIENT_SINK_OPEN);
return TRUE;
}
-static GstStateChangeReturn
-gst_tcp_client_sink_change_state (GstElement * element,
- GstStateChange transition)
+/* will be called only between calls to start() and stop() */
+static gboolean
+gst_tcp_client_sink_unlock (GstBaseSink * bsink)
{
- GstTCPClientSink *sink;
- GstStateChangeReturn res;
+ GstTCPClientSink *sink = GST_TCP_CLIENT_SINK (bsink);
- sink = GST_TCP_CLIENT_SINK (element);
+ GST_DEBUG_OBJECT (sink, "set to flushing");
+ g_cancellable_cancel (sink->cancellable);
- switch (transition) {
- case GST_STATE_CHANGE_NULL_TO_READY:
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- if (!gst_tcp_client_sink_start (sink))
- goto start_failure;
- break;
- default:
- break;
- }
- res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+ return TRUE;
+}
- switch (transition) {
- case GST_STATE_CHANGE_READY_TO_NULL:
- gst_tcp_client_sink_stop (sink);
- default:
- break;
- }
- return res;
+/* will be called only between calls to start() and stop() */
+static gboolean
+gst_tcp_client_sink_unlock_stop (GstBaseSink * bsink)
+{
+ GstTCPClientSink *sink = GST_TCP_CLIENT_SINK (bsink);
-start_failure:
- {
- return GST_STATE_CHANGE_FAILURE;
- }
+ GST_DEBUG_OBJECT (sink, "unset flushing");
+ g_cancellable_reset (sink->cancellable);
+
+ return TRUE;
}
projects / platform / upstream / gst-plugins-base.git / commitdiff