From 8b54123d396e455e30fc8c8e8910ef603f425d5c Mon Sep 17 00:00:00 2001
From: Volodymyr Shymanskyy <vshymanskyi@gmail.com>
Date: Wed, 27 Sep 2017 13:01:15 +0300
Subject: [PATCH] Add TinyGsmIpFromString(str)

---
 TinyGsmClientA6.h      | 15 +--------------
 TinyGsmClientESP8266.h | 15 +--------------
 TinyGsmClientM590.h    | 15 +--------------
 TinyGsmClientSIM800.h  | 15 +--------------
 TinyGsmClientXBee.h    | 30 +++---------------------------
 TinyGsmCommon.h        | 15 +++++++++++++++
 6 files changed, 22 insertions(+), 83 deletions(-)

diff --git a/TinyGsmClientA6.h b/TinyGsmClientA6.h
index 3377f92..9ebeccf 100644
--- a/TinyGsmClientA6.h
+++ b/TinyGsmClientA6.h
@@ -397,20 +397,7 @@ public:
   }
 
   IPAddress localIP() {
-    String strIP = getLocalIP();
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return res;
+    return TinyGsmIpFromString(getLocalIP());
   }
 
   /*
diff --git a/TinyGsmClientESP8266.h b/TinyGsmClientESP8266.h
index 6fffbb2..72d613c 100644
--- a/TinyGsmClientESP8266.h
+++ b/TinyGsmClientESP8266.h
@@ -292,20 +292,7 @@ public:
   }
 
   IPAddress localIP() {
-    String strIP = getLocalIP();
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return res;
+    return TinyGsmIpFromString(getLocalIP());
   }
 
 private:
diff --git a/TinyGsmClientM590.h b/TinyGsmClientM590.h
index b9d3a69..bb8faca 100644
--- a/TinyGsmClientM590.h
+++ b/TinyGsmClientM590.h
@@ -413,20 +413,7 @@ public:
   }
 
   IPAddress localIP() {
-    String strIP = getLocalIP();
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return res;
+    return TinyGsmIpFromString(getLocalIP());
   }
 
   /*
diff --git a/TinyGsmClientSIM800.h b/TinyGsmClientSIM800.h
index 9085c27..0633e34 100644
--- a/TinyGsmClientSIM800.h
+++ b/TinyGsmClientSIM800.h
@@ -545,20 +545,7 @@ public:
   }
 
   IPAddress localIP() {
-    String strIP = getLocalIP();
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return res;
+    return TinyGsmIpFromString(getLocalIP());
   }
 
   /*
diff --git a/TinyGsmClientXBee.h b/TinyGsmClientXBee.h
index 5f4b3aa..2814170 100644
--- a/TinyGsmClientXBee.h
+++ b/TinyGsmClientXBee.h
@@ -392,20 +392,7 @@ fail:
   }
 
   IPAddress localIP() {
-    String strIP = getLocalIP();
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return res;
+    return TinyGsmIpFromString(getLocalIP());
   }
 
   /*
@@ -459,19 +446,8 @@ private:
     unsigned long startMillis = millis();
     while (stream.available() < 8 && millis() - startMillis < 30000) {};
     strIP = streamReadUntil('\r');  // read result
-    int Parts[4] = {0,0,0,0};
-    int Part = 0;
-    for (uint8_t i=0; i<strIP.length(); i++) {
-      char c = strIP[i];
-      if (c == '.') {
-        Part++;
-        continue;
-      }
-      Parts[Part] *= 10;
-      Parts[Part] += c - '0';
-    }
-    IPAddress res(Parts[0], Parts[1], Parts[2], Parts[3]);
-    return modemConnect(res, port);
+    IPAddress ip = TinyGsmIpFromString(IPaddr);
+    return modemConnect(ip, port);
   }
 
   int modemConnect(IPAddress ip, uint16_t port, uint8_t mux = 0) {
diff --git a/TinyGsmCommon.h b/TinyGsmCommon.h
index e0a37aa..96207a9 100644
--- a/TinyGsmCommon.h
+++ b/TinyGsmCommon.h
@@ -93,4 +93,19 @@ uint32_t TinyGsmAutoBaud(T& SerialAT)
   return 0;
 }
 
+IPAddress TinyGsmIpFromString(const String& strIP) {
+  int Parts[4] = {0,0,0,0};
+  int Part = 0;
+  for (uint8_t i=0; i<strIP.length(); i++) {
+    char c = strIP[i];
+    if (c == '.') {
+      Part++;
+      continue;
+    }
+    Parts[Part] *= 10;
+    Parts[Part] += c - '0';
+  }
+  return IPAddress(Parts[0], Parts[1], Parts[2], Parts[3]);
+}
+
 #endif