[vlc-commits] Revert "access: add gopher input submodule to tcp.c"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jan 10 09:48:33 2020 +0100| [3e34b2350fcae3c0c4454790f16ef5ab510abe1f] | committer: Thomas Guillem

Revert "access: add gopher input submodule to tcp.c"

This reverts commit ad4a6702c930db3fc804bc661f95e41e58cfe61b.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e34b2350fcae3c0c4454790f16ef5ab510abe1f
---

 modules/access/tcp.c | 83 ----------------------------------------------------
 1 file changed, 83 deletions(-)

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 6ab6bf1c25..214a5853be 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -2,10 +2,8 @@
  * tcp.c: TCP input module
  *****************************************************************************
  * Copyright (C) 2003-2004 VLC authors and VideoLAN
- * Copyright (C) 2020 Vincenzo "KatolaZ" Nicosia
  *
  * Authors: Laurent Aimar <fenrir at via.ecp.fr>
- *          Vincenzo "KatolaZ" Nicosia <katolaz at freaknet.org> (gopher sub-module)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -31,13 +29,9 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_access.h>
-#include <vlc_messages.h>
 #include <vlc_url.h>
 #include <vlc_tls.h>
 
-#include <stdlib.h>
-#include <string.h>
-
 static ssize_t Read(stream_t *access, void *buf, size_t len)
 {
     return vlc_tls_Read(access->p_sys, buf, len, false);
@@ -112,73 +106,6 @@ static void Close( vlc_object_t *p_this )
     vlc_tls_SessionDelete(access->p_sys);
 }
 
-static int GopherOpen(vlc_object_t *obj)
-{
-    char *psz_path = NULL;
-    stream_t *access = (stream_t *)obj;
-    vlc_tls_t *sock;
-    vlc_url_t url;
-
-    if (vlc_UrlParse(&url, access->psz_url) || url.psz_host == NULL) 
-    {
-        msg_Err(access, "invalid location: %s", access->psz_location);
-        vlc_UrlClean(&url);
-        return VLC_EGENERIC;
-    }
-
-    if (url.i_port == 0)
-    {
-        url.i_port = 70;
-    }
-    sock = vlc_tls_SocketOpenTCP(obj, url.psz_host, url.i_port);
-
-    if (unlikely(sock == NULL))
-    {
-        msg_Err(access, "cannot connect to %s:%d", url.psz_host, url.i_port);
-        vlc_UrlClean(&url);
-        return VLC_EGENERIC;
-    }
-
-    if (url.psz_path == NULL || strlen(url.psz_path) <= 3)
-    {
-        /* If no resource type is specified, look for the root resource */
-        if (asprintf(&psz_path, "\r\n") == -1)
-        {
-            vlc_UrlClean(&url);
-            vlc_tls_SessionDelete(sock);
-            return VLC_EGENERIC;
-        }
-        msg_Warn(access, "path set to root resource");
-    }
-    else { /* strip resource type from URL */
-        if(asprintf(&psz_path, "%s\r\n", url.psz_path+2) == -1)
-        {
-            vlc_UrlClean(&url);
-            vlc_tls_SessionDelete(sock);
-            return VLC_EGENERIC;
-        }
-        msg_Warn(access, "stripped resource type from path");
-    }
-    vlc_UrlClean(&url);
-
-    access->p_sys = sock;
-    access->pf_read = Read;
-    access->pf_block = NULL;
-    access->pf_control = Control;
-    access->pf_seek = NULL;
-
-    msg_Warn(access, "requesting resource: %s", psz_path);
-    if (vlc_tls_Write(access->p_sys, psz_path, strlen(psz_path)) < 0)
-    {
-        vlc_tls_SessionDelete(access->p_sys);
-        free(psz_path);
-        return VLC_EGENERIC;
-    }
-
-    free(psz_path);
-    return VLC_SUCCESS;
-}
-
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
@@ -191,14 +118,4 @@ vlc_module_begin ()
     set_capability( "access", 0 )
     add_shortcut( "tcp" )
     set_callbacks( Open, Close )
-
-/* Gopher submodule */
-    add_submodule ()
-        set_description( N_("Gopher input") )
-        set_capability( "access", 0 )
-        set_shortname( "gopher" )
-        set_category( CAT_INPUT )
-        set_subcategory( SUBCAT_INPUT_ACCESS )
-        add_shortcut( "gopher" )
-        set_callbacks( GopherOpen, Close )
 vlc_module_end ()