[GNUnet-SVN] r37870 - libmicrohttpd/src/microhttpd

[gnunet]

Author: grothoff
Date: 2016-09-04 16:47:20 +0200 (Sun, 04 Sep 2016)
New Revision: 37870

Modified:
   libmicrohttpd/src/microhttpd/test_upgrade.c
   libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
Log:
-preparations for testing external select

Modified: libmicrohttpd/src/microhttpd/test_upgrade.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 12:44:24 UTC (rev 
37869)
+++ libmicrohttpd/src/microhttpd/test_upgrade.c 2016-09-04 14:47:20 UTC (rev 
37870)
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <pthread.h>
 
 #ifndef WINDOWS
 #include <unistd.h>
@@ -40,7 +41,42 @@
 #include "mhd_sockets.h"
 
 
+/**
+ * Thread we use to run the interaction with the upgraded socket.
+ */
+static pthread_t pt;
+
+/**
+ * Will be set to the upgraded socket.
+ */
+static MHD_socket usock;
+
+/**
+ * Thread we use to run the interaction with the upgraded socket.
+ */
+static pthread_t pt_client;
+
+
+/**
+ * Change itc FD options to be non-blocking.
+ *
+ * @param fd the FD to manipulate
+ * @return non-zero if succeeded, zero otherwise
+ */
 static void
+make_blocking (MHD_socket fd)
+{
+  int flags;
+
+  flags = fcntl (fd, F_GETFL);
+  if (-1 == flags)
+    return;
+  if ((flags & ~O_NONBLOCK) != flags)
+    fcntl (fd, F_SETFL, flags & ~O_NONBLOCK);
+}
+
+
+static void
 send_all (MHD_socket sock,
           const char *text)
 {
@@ -47,6 +83,7 @@
   size_t len = strlen (text);
   ssize_t ret;
 
+  make_blocking (sock);
   for (size_t off = 0; off < len; off += ret)
     {
       ret = write (sock,
@@ -77,6 +114,7 @@
   char c;
   ssize_t ret;
 
+  make_blocking (sock);
   next = '\r';
   i = 0;
   while (i < 4)
@@ -124,6 +162,7 @@
   char buf[len];
   ssize_t ret;
 
+  make_blocking (sock);
   for (size_t off = 0; off < len; off += ret)
     {
       ret = read (sock,
@@ -145,6 +184,54 @@
 
 
 /**
+ * Main function for the thread that runs the interaction with
+ * the upgraded socket.
+ *
+ * @param cls the handle for the upgrade
+ */
+static void *
+run_usock (void *cls)
+{
+  struct MHD_UpgradeResponseHandle *urh = cls;
+
+  send_all (usock,
+            "Hello");
+  recv_all (usock,
+            "World");
+  send_all (usock,
+            "Finished");
+  MHD_upgrade_action (urh,
+                      MHD_UPGRADE_ACTION_CLOSE);
+  return NULL;
+}
+
+
+/**
+ * Main function for the thread that runs the client-side of the
+ * interaction with the upgraded socket.
+ *
+ * @param cls the client socket
+ */
+static void *
+run_usock_client (void *cls)
+{
+  MHD_socket *sock = cls;
+
+  send_all (*sock,
+            "GET / HTTP/1.1\r\nConnection: Upgrade\r\n\r\n");
+  recv_hdr (*sock);
+  recv_all (*sock,
+            "Hello");
+  send_all (*sock,
+            "World");
+  recv_all (*sock,
+            "Finished");
+  MHD_socket_close_ (*sock);
+  return NULL;
+}
+
+
+/**
  * Function called after a protocol "upgrade" response was sent
  * successfully and the socket should now be controlled by some
  * protocol other than HTTP.
@@ -205,11 +292,13 @@
             MHD_socket sock,
             struct MHD_UpgradeResponseHandle *urh)
 {
-  send_all (sock, "Hello");
-  recv_all (sock, "World");
-  send_all (sock, "Finished");
-  MHD_upgrade_action (urh,
-                      MHD_UPGRADE_ACTION_CLOSE);
+  usock = sock;
+  if (0 != extra_in_size)
+    abort ();
+  pthread_create (&pt,
+                  NULL,
+                  &run_usock,
+                  urh);
 }
 
 
@@ -306,16 +395,15 @@
                     (struct sockaddr *) &sa,
                     sizeof (sa)))
     abort ();
-  send_all (sock,
-            "GET / HTTP/1.1\r\nConnection: Upgrade\r\n\r\n");
-  recv_hdr (sock);
-  recv_all (sock,
-            "Hello");
-  send_all (sock,
-            "World");
-  recv_all (sock,
-            "Finished");
-  MHD_socket_close_ (sock);
+  pthread_create (&pt_client,
+                  NULL,
+                  &run_usock_client,
+                  &sock);
+
+  pthread_join (pt_client,
+                NULL);
+  pthread_join (pt,
+                NULL);
   MHD_stop_daemon (d);
   return 0;
 }

Modified: libmicrohttpd/src/microhttpd/test_upgrade_ssl.c
===================================================================
--- libmicrohttpd/src/microhttpd/test_upgrade_ssl.c     2016-09-04 12:44:24 UTC 
(rev 37869)
+++ libmicrohttpd/src/microhttpd/test_upgrade_ssl.c     2016-09-04 14:47:20 UTC 
(rev 37870)
@@ -55,6 +55,11 @@
 static MHD_socket usock;
 
 /**
+ * Thread we use to run the interaction with the upgraded socket.
+ */
+static pthread_t pt_client;
+
+/**
  * Fork child that connects via OpenSSL to our @a port.  Allows us to
  * talk to our port over a socket in @a sp without having to worry
  * about TLS.
@@ -257,6 +262,31 @@
 
 
 /**
+ * Main function for the thread that runs the client-side of the
+ * interaction with the upgraded socket.
+ *
+ * @param cls the client socket
+ */
+static void *
+run_usock_client (void *cls)
+{
+  MHD_socket *sock = cls;
+
+  send_all (*sock,
+            "GET / HTTP/1.1\r\nConnection: Upgrade\r\n\r\n");
+  recv_hdr (*sock);
+  recv_all (*sock,
+            "Hello");
+  send_all (*sock,
+            "World");
+  recv_all (*sock,
+            "Finished");
+  MHD_socket_close_ (*sock);
+  return NULL;
+}
+
+
+/**
  * Function called after a protocol "upgrade" response was sent
  * successfully and the socket should now be controlled by some
  * protocol other than HTTP.
@@ -418,19 +448,18 @@
       return 4;
     }
 
-  send_all (sock,
-            "GET / HTTP/1.1\r\nConnection: Upgrade\r\n\r\n");
-  recv_hdr (sock);
-  recv_all (sock,
-            "Hello");
-  send_all (sock,
-            "World");
-  recv_all (sock,
-            "Finished");
-  MHD_socket_close_ (sock);
+  pthread_create (&pt_client,
+                  NULL,
+                  &run_usock_client,
+                  &sock);
+
+  pthread_join (pt_client,
+                NULL);
   pthread_join (pt,
                 NULL);
-  waitpid (pid, NULL, 0);
+  waitpid (pid,
+           NULL,
+           0);
   MHD_stop_daemon (d);
   return 0;
 }