Introduce use_dual_stack to allow support for both ipv4 and ipv6

* Introduce use_dual_stack to allow support for both ipv4 and ipv6.

See: etr#202

* Remove explicit DNS resolve for IPV6

* IPV6 tests run if IPV6_TESTS_ENABLED specified

* Enable IPV6 tests only on osx

Travis linux doesn't currently support IPV6

Author: etr

.travis.yml

@@ -33,6 +33,7 @@ before_install:
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo pip install gcovr; fi
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get install cppcheck; fi
  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export CFLAGS='-mtune=generic'; fi
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export IPV6_TESTS_ENABLED="true"; fi
  - |-
     case $TRAVIS_OS_NAME in
       windows)

README.md

@@ -188,6 +188,7 @@ For example, if your connection limit is “1”, a browser may open a first con
 * _.bind_socket(**int** socket_fd):_ Listen socket to use. Pass a listen socket for the daemon to use (systemd-style). If this option is used, the daemon will not open its own listen socket(s). The argument passed must be of type "int" and refer to an existing socket that has been bound to a port and is listening.
 * _.max_thread_stack_size(**int** stack_size):_ Maximum stack size for threads created by the library. Not specifying this option or using a value of zero means using the system default (which is likely to differ based on your platform). Default is `0 (system default)`.
 * _.use_ipv6() and .no_ipv6():_ Enable or disable the IPv6 protocol support (by default, libhttpserver will just support IPv4). If you specify this and the local platform does not support it, starting up the server will throw an exception. `off` by default.
+* _.use_dual_stack() and .no_dual_stack():_ Enable or disable the support for both IPv6 and IPv4 protocols at the same time (by default, libhttpserver will just support IPv4). If you specify this and the local platform does not support it, starting up the server will throw an exception. Note that this will mean that IPv4 addresses are returned in the IPv6-mapped format (the ’structsockaddrin6’ format will be used for IPv4 and IPv6). `off` by default.
 * _.pedantic() and .no_pedantic():_ Enables pedantic checks about the protocol (as opposed to as tolerant as possible). Specifically, at the moment, this flag causes the library to reject HTTP 1.1 connections without a `Host` header. This is required by the standard, but of course in violation of the “be as liberal as possible in what you accept” norm. It is recommended to turn this **off** if you are testing clients against the library, and **on** in production. `off` by default.
 * _.debug() and .no_debug():_ Enables debug messages from the library. `off` by default.
 * _.regex_checking() and .no_regex_checking():_ Enables pattern matching for endpoints. Read more [here](#registering-resources). `on` by default.

src/httpserver/create_webserver.hpp

@@ -120,6 +120,8 @@ class create_webserver
         create_webserver& no_ssl() { _use_ssl = false; return *this; }
         create_webserver& use_ipv6() { _use_ipv6 = true; return *this; }
         create_webserver& no_ipv6() { _use_ipv6 = false; return *this; }
+        create_webserver& use_dual_stack() { _use_dual_stack = true; return *this; }
+        create_webserver& no_dual_stack() { _use_dual_stack = false; return *this; }
         create_webserver& debug() { _debug = true; return *this; }
         create_webserver& no_debug() { _debug = false; return *this; }
         create_webserver& pedantic() { _pedantic = true; return *this; }
@@ -273,6 +275,7 @@ class create_webserver
         int _max_thread_stack_size = 0;
         bool _use_ssl = false;
         bool _use_ipv6 = false;
+        bool _use_dual_stack = false;
         bool _debug = false;
         bool _pedantic = false;
         std::string _https_mem_key = "";

src/httpserver/webserver.hpp

@@ -154,6 +154,7 @@ class webserver
         const int max_thread_stack_size;
         const bool use_ssl;
         const bool use_ipv6;
+        const bool use_dual_stack;
         const bool debug;
         const bool pedantic;
         const std::string https_mem_key;

src/webserver.cpp

@@ -149,6 +149,7 @@ webserver::webserver(const create_webserver& params):
     max_thread_stack_size(params._max_thread_stack_size),
     use_ssl(params._use_ssl),
     use_ipv6(params._use_ipv6),
+    use_dual_stack(params._use_dual_stack),
     debug(params._debug),
     pedantic(params._pedantic),
     https_mem_key(params._https_mem_key),
@@ -311,6 +312,8 @@ bool webserver::start(bool blocking)
         start_conf |= MHD_USE_SSL;
     if(use_ipv6)
         start_conf |= MHD_USE_IPv6;
+    if(use_dual_stack)
+        start_conf |= MHD_USE_DUAL_STACK;
     if(debug)
         start_conf |= MHD_USE_DEBUG;
     if(pedantic)

test/integ/ws_start_stop.cpp

@@ -143,6 +143,59 @@ LT_BEGIN_AUTO_TEST(ws_start_stop_suite, start_stop)
     }
 LT_END_AUTO_TEST(start_stop)
 
+#if defined(IPV6_TESTS_ENABLED)
+
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, ipv6)
+    {
+    webserver ws = create_webserver(8080).use_ipv6();
+    ok_resource ok;
+    ws.register_resource("base", &ok);
+    ws.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    LT_CHECK_EQ(s, "OK");
+    curl_easy_cleanup(curl);
+
+    ws.stop();
+    }
+LT_END_AUTO_TEST(ipv6)
+
+LT_BEGIN_AUTO_TEST(ws_start_stop_suite, dual_stack)
+    {
+    webserver ws = create_webserver(8080).use_dual_stack();
+    ok_resource ok;
+    ws.register_resource("base", &ok);
+    ws.start(false);
+
+    curl_global_init(CURL_GLOBAL_ALL);
+    std::string s;
+    CURL *curl = curl_easy_init();
+    CURLcode res;
+    curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:8080/base");
+    curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
+    curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &s);
+    res = curl_easy_perform(curl);
+    LT_ASSERT_EQ(res, 0);
+    LT_CHECK_EQ(s, "OK");
+    curl_easy_cleanup(curl);
+
+    ws.stop();
+    }
+LT_END_AUTO_TEST(dual_stack)
+
+#endif
 
 LT_BEGIN_AUTO_TEST(ws_start_stop_suite, sweet_kill)
     webserver ws = create_webserver(8080);