Rename dual stack only to ipv4 and ipv6 only

Author: sirknightj

CMakeLists.txt

@@ -30,7 +30,7 @@ option(AWS_KVS_USE_DUAL_STACK_ENDPOINT_ONLY "Use only dual-stack endpoints (igno
 # DNS IP resolution modes - mutually exclusive
 option(AWS_KVS_IPV4_ONLY "Use only IPv4 addresses from DNS (ignores env vars)" OFF)
 option(AWS_KVS_IPV6_ONLY "Use only IPv6 addresses from DNS (ignores env vars)" OFF)
-option(AWS_KVS_DUAL_STACK_ONLY "Use both IPv4 and IPv6 addresses from DNS (ignores env vars)" OFF)
+option(AWS_KVS_IPV4_AND_IPV6_ONLY "Use both IPv4 and IPv6 addresses from DNS (ignores env vars)" OFF)
 
 # Developer Flags
 option(BUILD_TEST "Build the testing tree." OFF)
@@ -91,8 +91,8 @@ if(AWS_KVS_IPV6_ONLY)
     set(IPV6_ONLY_FLAG 1)
 endif()
 
-if(AWS_KVS_DUAL_STACK_ONLY)
-    set(DUAL_STACK_ONLY_FLAG 1)
+if(AWS_KVS_IPV4_AND_IPV6_ONLY)
+    set(IPV4_AND_IPV6_FLAG 1)
 endif()
 
 # Sum the enabled flags
@@ -101,7 +101,7 @@ math(EXPR IPV_OPTIONS_ENABLED_COUNT
 
 # Check for conflicts
 if(IPV_OPTIONS_ENABLED_COUNT GREATER 1)
-    message(FATAL_ERROR "Only one of AWS_KVS_IPV4_ONLY, AWS_KVS_IPV6_ONLY, or AWS_KVS_DUAL_STACK_ONLY can be enabled.")
+    message(FATAL_ERROR "Only one of AWS_KVS_IPV4_ONLY, AWS_KVS_IPV6_ONLY, or AWS_KVS_IPV4_AND_IPV6_ONLY can be enabled.")
 endif()
 
 # Translate the CMake flags to the pre-processor macros
@@ -113,8 +113,8 @@ if(AWS_KVS_IPV6_ONLY)
     add_definitions(-DAWS_KVS_IPV6_ONLY)
 endif()
 
-if(AWS_KVS_DUAL_STACK_ONLY)
-    add_definitions(-DAWS_KVS_DUAL_STACK_ONLY)
+if(AWS_KVS_IPV4_AND_IPV6_ONLY)
+    add_definitions(-DAWS_KVS_IPV4_AND_IPV6_ONLY)
 endif()
 
 if(AWS_KVS_USE_LEGACY_ENDPOINT_ONLY)

README.md

@@ -63,7 +63,7 @@ You can pass the following options to `cmake ..`.
 * `-DAWS_KVS_USE_DUAL_STACK_ENDPOINT_ONLY` -- Use only dual-stack endpoints (ignores env vars). Default is OFF.
 * `-DAWS_KVS_IPV4_ONLY` -- Use only IPv4 addresses from DNS (ignores env vars). Default is OFF.
 * `-DAWS_KVS_IPV6_ONLY` -- Use only IPv6 addresses from DNS (ignores env vars). Default is OFF.
-* `-DAWS_KVS_DUAL_STACK_ONLY` -- Use both IPv4 and IPv6 addresses from DNS (ignores env vars). Default is OFF.
+* `-DAWS_KVS_IPV4_AND_IPV6_ONLY` -- Use both IPv4 and IPv6 addresses from DNS (ignores env vars). Default is OFF.
 
 
 DMEMORY_SANITIZER, DTHREAD_SANITIZER etc. flags works only with clang compiler 
@@ -215,7 +215,7 @@ The default endpoints and DNS resolution chain is implemented by the SDK. It seq
 With 2, 3, and 4, the endpoint will be constructed based on the region provided to `createAbstractDefaultCallbacksProvider`.
 
 #### DNS filtering
-1. DNS resolution CMake parameters: (`-DAWS_KVS_IPV4_ONLY=TRUE`, `-DAWS_KVS_IPV6_ONLY=TRUE`, `-DAWS_KVS_DUAL_STACK_ONLY=TRUE`)
+1. DNS resolution CMake parameters: (`-DAWS_KVS_IPV4_ONLY=TRUE`, `-DAWS_KVS_IPV6_ONLY=TRUE`, `-DAWS_KVS_IPV4_AND_IPV6_ONLY=TRUE`)
 2. Environment variables (`export AWS_KVS_USE_IPV4=TRUE`, `export AWS_KVS_USE_IPV6=TRUE`)
 3. Otherwise, no filtering will take place. Both IPv4 and IPv6 IP addresses, if returned by DNS, may be used.
 

src/source/Response.c

@@ -186,9 +186,9 @@ STATUS initializeCurlSession(PRequestInfo pRequestInfo, PCallInfo pCallInfo, CUR
 #elif defined(AWS_KVS_IPV6_ONLY)
     curl_easy_setopt(pCurl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6);
     DLOGD("Curl resolving IPV6 through AWS_KVS_IPV6_ONLY");
-#elif defined(AWS_KVS_DUAL_STACK_ONLY)
+#elif defined(AWS_KVS_IPV4_AND_IPV6_ONLY)
     curl_easy_setopt(pCurl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
-    DLOGD("Curl resolving dual stack through AWS_KVS_DUAL_STACK_ONLY");
+    DLOGD("Curl resolving dual stack through AWS_KVS_IPV4_AND_IPV6_ONLY");
 #else
     if (!IS_NULL_OR_EMPTY_STRING(GETENV(KVS_CURL_IPRESOLVE_V4_ENV_VAR))) {
         curl_easy_setopt(pCurl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);

src/source/Response.h

@@ -30,9 +30,9 @@ extern "C" {
 #define KVS_CURL_IPRESOLVE_V6_ENV_VAR "AWS_KVS_USE_IPV6"
 #define KVS_CURL_DEBUG_ENV_VAR        "KVS_CURL_DEBUG"
 
-#if (defined(AWS_KVS_IPV4_ONLY) && defined(AWS_KVS_IPV6_ONLY)) || (defined(AWS_KVS_IPV4_ONLY) && defined(AWS_KVS_DUAL_STACK_ONLY)) ||                \
-    (defined(AWS_KVS_IPV6_ONLY) && defined(AWS_KVS_DUAL_STACK_ONLY))
-#error "Only one of AWS_KVS_IPV4_ONLY, AWS_KVS_IPV6_ONLY, or AWS_KVS_DUAL_STACK_ONLY can be defined"
+#if (defined(AWS_KVS_IPV4_ONLY) && defined(AWS_KVS_IPV6_ONLY)) || (defined(AWS_KVS_IPV4_ONLY) && defined(AWS_KVS_IPV4_AND_IPV6_ONLY)) ||                \
+    (defined(AWS_KVS_IPV6_ONLY) && defined(AWS_KVS_IPV4_AND_IPV6_ONLY))
+#error "Only one of AWS_KVS_IPV4_ONLY, AWS_KVS_IPV6_ONLY, or AWS_KVS_IPV4_AND_IPV6_ONLY can be defined"
 #endif
 
 // this is used by postReadCallback to sleep before checking for more data

tst/scripts/test_cmake_flags.sh

@@ -6,11 +6,11 @@
 COMBINATIONS=(
   "-DAWS_KVS_IPV4_ONLY=1 OK"
   "-DAWS_KVS_IPV6_ONLY=TRUE OK"
-  "-DAWS_KVS_DUAL_STACK_ONLY=true OK"
+  "-DAWS_KVS_IPV4_AND_IPV6_ONLY=true OK"
   "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV6_ONLY=YES FAIL"
-  "-DAWS_KVS_IPV6_ONLY=ON -DAWS_KVS_DUAL_STACK_ONLY=ON FAIL"
-  "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_DUAL_STACK_ONLY=ON FAIL"
-  "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV6_ONLY=ON -DAWS_KVS_DUAL_STACK_ONLY=ON FAIL"
+  "-DAWS_KVS_IPV6_ONLY=ON -DAWS_KVS_IPV4_AND_IPV6_ONLY=ON FAIL"
+  "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV4_AND_IPV6_ONLY=ON FAIL"
+  "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV6_ONLY=ON -DAWS_KVS_IPV4_AND_IPV6_ONLY=ON FAIL"
   "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV6_ONLY=N OK"
   "-DAWS_KVS_IPV4_ONLY=on -DAWS_KVS_IPV6_ONLY=NO OK"
   "-DAWS_KVS_IPV4_ONLY=ON -DAWS_KVS_IPV6_ONLY=false OK"