[0.11] gst-plugins-base: tcp: Remove old socket helper functions

Sebastian Dröge slomo at kemper.freedesktop.org
Mon Jan 16 02:34:36 PST 2012


Module: gst-plugins-base
Branch: 0.11
Commit: 1148919ad00cb5e3873189c427a0cc4df7a18a9e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=1148919ad00cb5e3873189c427a0cc4df7a18a9e

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Jan 16 11:01:10 2012 +0100

tcp: Remove old socket helper functions

---

 gst/tcp/Makefile.am |    1 -
 gst/tcp/gsttcp.c    |  225 ---------------------------------------------------
 gst/tcp/gsttcp.h    |   12 ---
 3 files changed, 0 insertions(+), 238 deletions(-)

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 40e1913..074c970 100644
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -15,7 +15,6 @@ BUILT_SOURCES = $(built_sources) $(built_headers)
 
 libgsttcp_la_SOURCES = \
 	gsttcpplugin.c \
-	gsttcp.c \
 	gsttcpclientsrc.c gsttcpclientsink.c \
 	gstmultisocketsink.c  \
 	gsttcpserversrc.c gsttcpserversink.c
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
deleted file mode 100644
index cf1c4ad..0000000
--- a/gst/tcp/gsttcp.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* GStreamer
- * Copyright (C) <1999> Erik Walthinsen <omega at cse.ogi.edu>
- * Copyright (C) <2004> Thomas Vander Stichele <thomas at apestaart dot org>
- *
- * gsttcp.c: TCP functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-#ifdef HAVE_FIONREAD_IN_SYS_FILIO
-#include <sys/filio.h>
-#endif
-
-#include "gsttcp.h"
-#include <gst/gst-i18n-plugin.h>
-
-GST_DEBUG_CATEGORY_EXTERN (tcp_debug);
-#define GST_CAT_DEFAULT tcp_debug
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-/* resolve host to IP address, throwing errors if it fails */
-/* host can already be an IP address */
-/* returns a newly allocated gchar * with the dotted ip address,
-   or NULL, in which case it already fired an error. */
-gchar *
-gst_tcp_host_to_ip (GstElement * element, const gchar * host)
-{
-  struct hostent *hostinfo;
-  char **addrs;
-  gchar *ip;
-  struct in_addr addr;
-
-  GST_DEBUG_OBJECT (element, "resolving host %s", host);
-
-  /* first check if it already is an IP address */
-  if (inet_aton (host, &addr)) {
-    ip = g_strdup (host);
-    goto beach;
-  }
-  /* FIXME: could do a localhost check here */
-
-  /* perform a name lookup */
-  if (!(hostinfo = gethostbyname (host)))
-    goto resolve_error;
-
-  if (hostinfo->h_addrtype != AF_INET)
-    goto not_ip;
-
-  addrs = hostinfo->h_addr_list;
-
-  /* There could be more than one IP address, but we just return the first */
-  ip = g_strdup (inet_ntoa (*(struct in_addr *) *addrs));
-
-beach:
-  GST_DEBUG_OBJECT (element, "resolved to IP %s", ip);
-  return ip;
-
-resolve_error:
-  {
-    GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, (NULL),
-        ("Could not find IP address for host \"%s\".", host));
-    return NULL;
-  }
-not_ip:
-  {
-    GST_ELEMENT_ERROR (element, RESOURCE, NOT_FOUND, (NULL),
-        ("host \"%s\" is not an IP host", host));
-    return NULL;
-  }
-}
-
-/* write buffer to given socket incrementally.
- * Returns number of bytes written.
- */
-gint
-gst_tcp_socket_write (int socket, const void *buf, size_t count)
-{
-  size_t bytes_written = 0;
-
-  while (bytes_written < count) {
-    ssize_t wrote = send (socket, (const char *) buf + bytes_written,
-        count - bytes_written, MSG_NOSIGNAL);
-
-    if (wrote <= 0) {
-      GST_WARNING ("error while writing");
-      return bytes_written;
-    }
-    bytes_written += wrote;
-  }
-
-  GST_LOG ("wrote %" G_GSIZE_FORMAT " bytes successfully", bytes_written);
-  return bytes_written;
-}
-
-/* close the socket and reset the fd.  Used to clean up after errors. */
-void
-gst_tcp_socket_close (GstPollFD * socket)
-{
-  if (socket->fd >= 0) {
-    close (socket->fd);
-    socket->fd = -1;
-  }
-}
-
-/* read a buffer from the given socket
- * returns:
- * - a GstBuffer in which data should be read
- * - NULL, indicating a connection close or an error, to be handled with
- *         EOS
- */
-GstFlowReturn
-gst_tcp_read_buffer (GstElement * this, int socket, GstPoll * fdset,
-    GstBuffer ** buf)
-{
-  int ret;
-  gssize bytes_read;
-  int readsize;
-  guint8 *data;
-
-  *buf = NULL;
-
-  /* do a blocking select on the socket */
-  /* no action (0) is an error too in our case */
-  if ((ret = gst_poll_wait (fdset, GST_CLOCK_TIME_NONE)) <= 0) {
-    if (ret == -1 && errno == EBUSY)
-      goto cancelled;
-    else
-      goto select_error;
-  }
-
-  /* ask how much is available for reading on the socket */
-  if (ioctl (socket, FIONREAD, &readsize) < 0)
-    goto ioctl_error;
-
-  if (readsize == 0)
-    goto got_eos;
-
-  /* sizeof(ssize_t) >= sizeof(int), so I know readsize <= SSIZE_MAX */
-
-  *buf = gst_buffer_new_and_alloc (readsize);
-
-  data = gst_buffer_map (*buf, NULL, NULL, GST_MAP_WRITE);
-  bytes_read = read (socket, data, readsize);
-  gst_buffer_unmap (*buf, data, bytes_read);
-
-  if (bytes_read < 0)
-    goto read_error;
-
-  if (bytes_read < readsize)
-    /* but mom, you promised to give me readsize bytes! */
-    goto short_read;
-
-  GST_LOG_OBJECT (this,
-      "returning buffer of size %" G_GSSIZE_FORMAT, bytes_read);
-  return GST_FLOW_OK;
-
-  /* ERRORS */
-select_error:
-  {
-    GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL),
-        ("select failed: %s", g_strerror (errno)));
-    return GST_FLOW_ERROR;
-  }
-cancelled:
-  {
-    GST_DEBUG_OBJECT (this, "Select was cancelled");
-    return GST_FLOW_WRONG_STATE;
-  }
-ioctl_error:
-  {
-    GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL),
-        ("ioctl failed: %s", g_strerror (errno)));
-    return GST_FLOW_ERROR;
-  }
-got_eos:
-  {
-    GST_DEBUG_OBJECT (this, "Got EOS on socket stream");
-    return GST_FLOW_EOS;
-  }
-read_error:
-  {
-    GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL),
-        ("read failed: %s", g_strerror (errno)));
-    gst_buffer_unref (*buf);
-    *buf = NULL;
-    return GST_FLOW_ERROR;
-  }
-short_read:
-  {
-    GST_ELEMENT_ERROR (this, RESOURCE, READ, (NULL),
-        ("short read: wanted %d bytes, got %" G_GSSIZE_FORMAT, readsize,
-            bytes_read));
-    gst_buffer_unref (*buf);
-    *buf = NULL;
-    return GST_FLOW_ERROR;
-  }
-}
diff --git a/gst/tcp/gsttcp.h b/gst/tcp/gsttcp.h
index f785fec..aef6b74 100644
--- a/gst/tcp/gsttcp.h
+++ b/gst/tcp/gsttcp.h
@@ -30,16 +30,4 @@
 #define TCP_DEFAULT_HOST        "localhost"
 #define TCP_DEFAULT_PORT        4953
 
-G_BEGIN_DECLS
-
-gchar * gst_tcp_host_to_ip (GstElement *element, const gchar *host);
-
-gint gst_tcp_socket_write (int socket, const void *buf, size_t count);
-
-void gst_tcp_socket_close (GstPollFD *socket);
-
-GstFlowReturn gst_tcp_read_buffer (GstElement * this, int socket, GstPoll * fdset, GstBuffer **buf);
-
-G_END_DECLS
-
 #endif /* __GST_TCP_HELP_H__ */



More information about the gstreamer-commits mailing list