X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Fclient.c;h=9f9a53f5289a0d40bedcae79695a2508852f4f34;hb=HEAD;hp=51429107c40c83c14c54bad8e50779721256ee99;hpb=72f63c90dd442da6139399d3a3b7fd574d209e08;p=tlsproxy%2Ftlsproxy.git

diff --git a/tests/client.c b/tests/client.c
index 5142910..9f9a53f 100644
--- a/tests/client.c
+++ b/tests/client.c
@@ -1,7 +1,7 @@
 /*
  * Simple GnuTLS client used for testing.
  *
- * Copyright (C) 2011-2013  Simon Ruderich
+ * Copyright (C) 2011-2014  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,9 @@
 #include <config.h>
 
 #include <arpa/inet.h>
+#include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,6 +41,12 @@ static int fdopen_read_write(int socket, FILE **read_fd, FILE **write_fd);
 static int connect_to_host(const char *hostname, const char *port);
 static int read_http_request(FILE *client_fd, char *request, size_t length);
 
+#if 0
+static void log_function_gnutls(int level, const char *string) {
+    (void)level;
+    fprintf(stderr, "    => %s", string);
+}
+#endif
 
 int main (int argc, char *argv[]) {
     int result, response;
@@ -57,7 +65,10 @@ int main (int argc, char *argv[]) {
     if (argc != 5 && argc != 6) {
         fprintf(stderr,
                 "Usage: %s <ca-file> <hostname> <port> <hostname-verify> "
-                          "[<digest-authentication>]\n",
+                          "[<digest-authentication>]\n"
+                "\n"
+                "tlsproxy must be running on port 4711, "
+                "<port> is the <hostname> port.\n",
                 argv[0]);
         return EXIT_FAILURE;
     }
@@ -65,6 +76,11 @@ int main (int argc, char *argv[]) {
     gnutls_global_init();
     gnutls_certificate_allocate_credentials(&xcred);
 
+#if 0
+    gnutls_global_set_log_level(10);
+    gnutls_global_set_log_function(log_function_gnutls);
+#endif
+
     gnutls_certificate_set_x509_trust_file(xcred,
                                            argv[1], GNUTLS_X509_FMT_PEM);
 
@@ -87,7 +103,7 @@ int main (int argc, char *argv[]) {
     }
     fprintf(fd_write, "\r\n");
     fflush(fd_write);
-    if (read_http_request(fd_read, buffer, sizeof(buffer)) == -1) {
+    if (read_http_request(fd_read, buffer, sizeof(buffer)) != 0) {
         fprintf(stderr, "invalid proxy response\n");
         return EXIT_FAILURE;
     }
@@ -104,7 +120,12 @@ int main (int argc, char *argv[]) {
         return EXIT_FAILURE;
     }
 
+#ifdef HAVE_GNUTLS_TRANSPORT_SET_INT2
+    /* gnutls_transport_set_int() is a macro. */
+    gnutls_transport_set_int(session, server);
+#else
     gnutls_transport_set_ptr(session, (gnutls_transport_ptr_t)server);
+#endif
 
     result = gnutls_handshake(session);
     if (result != GNUTLS_E_SUCCESS) {
@@ -153,6 +174,11 @@ int main (int argc, char *argv[]) {
 
     gnutls_x509_crt_deinit(cert);
 
+    /* Send a bogus request to the server. Otherwise recent gnutls-serv won't
+     * terminate the connection when gnutls_bye() is used. */
+    gnutls_record_send(session, "GET / HTTP/1.0\r\n\r\n",
+                                strlen("GET / HTTP/1.0\r\n\r\n"));
+
     gnutls_bye(session, GNUTLS_SHUT_RDWR);
     fclose(fd_read);
     fclose(fd_write);
@@ -203,8 +229,10 @@ static int connect_to_host(const char *hostname, const char *port) {
     gai_hints.ai_socktype = SOCK_STREAM;
     gai_hints.ai_protocol = 0;
     gai_hints.ai_flags    = AI_NUMERICSERV /* given port is numeric */
+#ifdef AI_ADDRCONFIG
                           | AI_ADDRCONFIG  /* supported by this computer */
-                          | AI_V4MAPPED;   /* support IPv4 through IPv6 */
+#endif
+                          ;
     gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result);
     if (gai_return != 0) {
         if (gai_return == EAI_SYSTEM) {
@@ -248,6 +276,7 @@ static int connect_to_host(const char *hostname, const char *port) {
 static int read_http_request(FILE *client_fd, char *request, size_t length) {
     char buffer[MAX_REQUEST_LINE];
 
+    assert(length <= INT_MAX);
     if (fgets(request, (int)length, client_fd) == NULL) {
         if (ferror(client_fd)) {
             perror("read_http_request(): fgets()");
@@ -266,6 +295,8 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
     if (ferror(client_fd)) {
         perror("read_http_request(): fgets()");
         return -1;
+    } else if (feof(client_fd)) {
+        return -2;
     }
 
     return 0;