twister

commit ee85c023d8eb74bd633efe4d4b6710b7759ea62b
parent 3471854c51d58a74863962cecb490323383010c7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 20 Jan 2018 14:08:42 +0100

dce

Diffstat:
M
src/twister/taler-twister.c
 | 
69
+--------------------------------------------------------------------

1 file changed, 1 insertion(+), 68 deletions(-)
diff --git a/src/twister/taler-twister.c b/src/twister/taler-twister.c
@@ -37,45 +37,11 @@
 
 
 /**
- * Default Socks5 listen port.
- */
-#define GNUNET_GNS_PROXY_PORT 7777
-
-/**
- * Maximum supported length for a URI.
- * Should die. @deprecated
- */
-#define MAX_HTTP_URI_LENGTH 2048
-
-/**
  * Size of the buffer for the data upload / download.  Must be
  * enough for curl, thus CURL_MAX_WRITE_SIZE is needed here (16k).
  */
 #define IO_BUFFERSIZE CURL_MAX_WRITE_SIZE
 
-/**
- * Size of the read/write buffers for Socks.   Uses
- * 256 bytes for the hostname (at most), plus a few
- * bytes overhead for the messages.
- */
-#define SOCKS_BUFFERSIZE (256 + 32)
-
-/**
- * Port for plaintext HTTP.
- */
-#define HTTP_PORT 80
-
-/**
- * After how long do we clean up unused MHD SSL/TLS instances?
- */
-#define MHD_CACHE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
- * After how long do we clean up Socks5 handles that failed to show any activity
- * with their respective MHD instance?
- */
-#define HTTP_HANDSHAKE_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
-
 
 /**
  * Log curl error.
@@ -167,16 +133,6 @@ struct HttpRequest
   struct GNUNET_SCHEDULER_Task * wtask;
 
   /**
-   * Read buffer
-   */
-  char rbuf[SOCKS_BUFFERSIZE];
-
-  /**
-   * Write buffer
-   */
-  char wbuf[SOCKS_BUFFERSIZE];
-
-  /**
    * Buffer we use for moving data between MHD and curl (in both directions).
    */
   char io_buf[IO_BUFFERSIZE];
@@ -202,36 +158,16 @@ struct HttpRequest
   struct curl_slist *headers;
 
   /**
-   * DNS->IP mappings resolved through GNS
-   */
-  struct curl_slist *hosts;
-
-  /**
    * HTTP response code to give to MHD for the response.
    */
   unsigned int response_code;
 
   /**
-   * Number of bytes already in read buffer
-   */
-  size_t rbuf_len;
-
-  /**
-   * Number of bytes already in write buffer
-   */
-  size_t wbuf_len;
-
-  /**
    * Number of bytes already in the IO buffer.
    */
   size_t io_len;
 
   /**
-   * Once known, what's the target address for the connection?
-   */
-  struct sockaddr_storage destination_address;
-
-  /**
    * Headers from response
    */
   struct HttpResponseHeader *header_head;
@@ -305,6 +241,7 @@ run_mhd_now (void);
 static void
 curl_download_prepare ();
 
+
 /**
  * Callback for MHD response generation.  This function is called from
  * MHD whenever MHD expects to get data back.  Copies data from the
@@ -1021,8 +958,6 @@ create_response (void *cls,
       curl_easy_setopt (hr->curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE);
     }
 
-    curl_easy_setopt (hr->curl, CURLOPT_USE_SSL, CURLUSESSL_NONE);
-
     if (CURLM_OK != curl_multi_add_handle (curl_multi, hr->curl))
     {
       GNUNET_break (0);
@@ -1118,8 +1053,6 @@ mhd_completed_cb (void *cls,
     curl_slist_free_all (hr->headers);
     hr->headers = NULL;
     curl_easy_reset (hr->curl);
-    hr->rbuf_len = 0;
-    hr->wbuf_len = 0;
     hr->io_len = 0;
   }
   if ( (NULL != hr->response) &&