From c3db8618b1b6b5fbd0628e4f779cc635d7187e8d Mon Sep 17 00:00:00 2001
From: Isaranu Janthong <isaranujanthong@yahoo.com>
Date: Tue, 21 May 2019 21:44:09 +0700
Subject: [PATCH] Add utility function 'get UDP IP/port'

---
 src/IoTtweetNBIoT.cpp | 51 ++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/IoTtweetNBIoT.cpp b/src/IoTtweetNBIoT.cpp
index 07e9789..c08f85a 100644
--- a/src/IoTtweetNBIoT.cpp
+++ b/src/IoTtweetNBIoT.cpp
@@ -4,7 +4,7 @@
 /* IoTtweet configuration parameter */
 #define IoTtweetNBIoT_HOST "35.185.177.33"    // - New Cloud IoTtweet server
 #define IoTtweetNBIoT_PORT "5683"             // - Default udp port
-#define IoTtweetNBIoT_libVersion "v1.7"
+#define IoTtweetNBIoT_libVersion "v2.1"
 
 /* AIS_NB_BC95 library parameter */
 String apnName = "devkit.nb";
@@ -116,6 +116,36 @@ String IoTtweetNBIoT::getNetworkTime(){
   return _ntp;
 }
 
+String IoTtweetNBIoT::getControlbySwitch(String userid, String key, int swnum){
+
+  _userid = userid;
+  _key = key;
+  _swnum = String(swnum);
+
+  String _getswctl = "SWC";
+         _getswctl += ":";
+         _getswctl += _userid;
+         _getswctl += ":";
+         _getswctl += _key;
+         _getswctl += ":";
+         _getswctl += _swnum;
+
+  UDPSend udpGetcontrol = AISnb.sendUDPmsgStr(serverIP, serverPort, _getswctl);
+  String _ctlstatus = getRespFromServer();
+  return _ctlstatus;
+}
+
+String IoTtweetNBIoT::getUDPip(){
+
+    String _udpipPacket = "IP";
+    Serial.println("Request UDP IP address");
+
+    UDPSend udpIP = AISnb.sendUDPmsgStr(serverIP, serverPort, _udpipPacket);
+    _udpip = getRespFromServer();
+
+    return _udpip;
+}
+
 String IoTtweetNBIoT::getRespFromServer(){
 
   String respStr = "";
@@ -140,25 +170,6 @@ String IoTtweetNBIoT::getRespFromServer(){
 
 }
 
-String IoTtweetNBIoT::getControlbySwitch(String userid, String key, int swnum){
-
-  _userid = userid;
-  _key = key;
-  _swnum = String(swnum);
-
-  String _getswctl = "SWC";
-         _getswctl += ":";
-         _getswctl += _userid;
-         _getswctl += ":";
-         _getswctl += _key;
-         _getswctl += ":";
-         _getswctl += _swnum;
-
-  UDPSend udpGetcontrol = AISnb.sendUDPmsgStr(serverIP, serverPort, _getswctl);
-  String _ctlstatus = getRespFromServer();
-  return _ctlstatus;
-}
-
 /*
 String IoTtweetNBIoT::receiveResponse(){