Removed isIPv4 and isIPv6 (moved to wsjcpp-validators)

Author: sea5kg

src/wsjcpp_core.cpp

@@ -18,7 +18,6 @@
 #include <streambuf>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <arpa/inet.h>
 
 // ---------------------------------------------------------------------
 
@@ -421,44 +420,6 @@ std::string WSJCppCore::createUuid() {
 
 // ---------------------------------------------------------------------
 
-bool WSJCppCore::isIPv4(const std::string& str) {
-    int n = 0;
-    std::string s[4] = {"", "", "", ""};
-    for (int i = 0; i < str.length(); i++) {
-        char c = str[i];
-        if (n > 3) {
-            return false;
-        }
-        if (c >= '0' && c <= '9') {
-            s[n] += c;
-        } else if (c == '.') {
-            n++;
-        } else {
-            return false;
-        }
-    }
-    for (int i = 0; i < 4; i++) {
-        if (s[i].length() > 3) {
-            return false;
-        }
-        int p = std::stoi(s[i]);
-        if (p > 255 || p < 0) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// ---------------------------------------------------------------------
-
-bool WSJCppCore::isIPv6(const std::string& str) {
-    unsigned char buf[sizeof(struct in6_addr)];
-    bool isValid = inet_pton(AF_INET6, str.c_str(), buf);
-    return isValid;
-}
-
-// ---------------------------------------------------------------------
-
 unsigned long WSJCppCore::convertVoidToULong(void *p) {
     unsigned long ret = *(unsigned long *)p;
     return ret;

src/wsjcpp_core.h

@@ -49,8 +49,6 @@ class WSJCppCore {
 
         static void initRandom();
         static std::string createUuid();
-        static bool isIPv4(const std::string& str);
-        static bool isIPv6(const std::string& str);
 
         static unsigned long convertVoidToULong(void *p);
         static std::string getPointerAsHex(void *p);

unit-tests.wsjcpp/CMakeLists.txt

@@ -30,10 +30,6 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_uuid.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_uuid.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_extract_filename.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_core_extract_filename.cpp")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_ip_v4.h")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_ip_v4.cpp")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_ip_v6.h")
-list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_ip_v6.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_to_upper.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_create_uuid.h")

unit-tests.wsjcpp/src/unit_test_ip_v4.cpp

@@ -50,10 +50,6 @@ unit-tests:
       description: Check test generate uuid function
     - name: CoreExtractFilename
       description: Check function extract filenane from path
-    - name: IpV4
-      description: Check function isIPv4
-    - name: IpV6
-      description: Check function isIPv6
     - name: "ToUpper"
       description: "String to upper"
     - name: "CreateUuid"