GainSpan Wi-Fi library

Diff: Socket/TCPSocketConnection.cpp

Revision:

5:78943b3945b5

Parent:

1:fb4494783863

Child:

8:64184a968e3b

--- a/Socket/TCPSocketConnection.cpp	Thu Dec 20 15:08:58 2012 +0000
+++ b/Socket/TCPSocketConnection.cpp	Sun Jan 27 14:31:19 2013 +0000
@@ -1,125 +1,159 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "TCPSocketConnection.h"
-#include <algorithm>
-
-TCPSocketConnection::TCPSocketConnection() {}
-
-int TCPSocketConnection::connect(const char* host, const int port)
-{  
-    if (!wifi->connect(host, port))
-        return -1;
-    wifi->flush();
-    return 0;
-}
-
-bool TCPSocketConnection::is_connected(void)
-{
-    return wifi->is_connected();
-}
-
-int TCPSocketConnection::send(char* data, int length)
-{
-    Timer tmr;
-
-    if (!_blocking) {
-        tmr.start();
-        while (tmr.read_ms() < _timeout) {
-            if (wifi->writeable())
-                break;
-        }
-        if (tmr.read_ms() >= _timeout) {
-            return -1;
-        }
-    }
-    return wifi->send(data, length);
-}
-
-// -1 if unsuccessful, else number of bytes written
-int TCPSocketConnection::send_all(char* data, int length)
-{
-    Timer tmr;
-    int idx = 0;
-    tmr.start();
-
-    while ((tmr.read_ms() < _timeout) || _blocking) {
-
-        idx += wifi->send(data, length);
-
-        if (idx == length)
-            return idx;
-    }
-    return (idx == 0) ? -1 : idx;
-}
-
-// -1 if unsuccessful, else number of bytes received
-int TCPSocketConnection::receive(char* data, int length)
-{
-    Timer tmr;
-    int time = -1;
-    
-    
-    if (!_blocking) {
-        tmr.start();
-        while (time < _timeout + 20) {
-            if (wifi->readable()) {
-                break;
-            }
-            time = tmr.read_ms();
-        }
-        if (time >= _timeout + 20) {
-            return -1;
-        }
-    }
-
-
-    while(!wifi->readable());
-    int nb_available = wifi->readable();
-    for (int i = 0; i < min(nb_available, length); i++) {
-        data[i] = wifi->getc();
-    }
-
-    return min(nb_available, length);
-}
-
-
-// -1 if unsuccessful, else number of bytes received
-int TCPSocketConnection::receive_all(char* data, int length)
-{
-    Timer tmr;
-    int idx = 0;
-    int time = -1;
-
-    tmr.start();
-    
-    while (time < _timeout || _blocking) {
-
-        int nb_available = wifi->readable();
-        for (int i = 0; i < min(nb_available, length); i++) {
-            data[idx++] = wifi->getc();
-        }
-
-        if (idx == length)
-            break;
-
-        time = tmr.read_ms();
-    }
-
-    return (idx == 0) ? -1 : idx;
-}
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/* Copyright (C) 2013 gsfan, MIT License
+ *  port to the GainSpan Wi-FI module GS1011
+ */
+
+#include "TCPSocketConnection.h"
+#include <algorithm>
+
+TCPSocketConnection::TCPSocketConnection() {}
+
+int TCPSocketConnection::connect(const char* host, const int port)
+{  
+    char cmd[CFG_CMD_SIZE];
+    char ip[16];
+
+    if (_cid < 0 || !_wifi->is_connected(_cid)) {
+        // Socket open
+        if (_wifi->gethostbyname(host, ip) == false) return -1;
+        _server = false;
+        sprintf(cmd, "AT+NCTCP=%s,%d", ip, port);
+        if (_wifi->sendCommand(cmd, GSwifi::RES_CONNECT) == false) return -1;
+        _cid = _wifi->readCID();
+        return 0;
+    }
+
+    return -1;
+}
+
+bool TCPSocketConnection::is_connected(void)
+{
+    return _wifi->is_connected(_cid);
+}
+
+int TCPSocketConnection::send(char* data, int length)
+{
+    char cmd[CFG_CMD_SIZE];
+    Timer tmr;
+
+    if (!_blocking) {
+        tmr.start();
+        while (tmr.read_ms() < _timeout) {
+            if (_wifi->writeable())
+                break;
+        }
+        if (tmr.read_ms() >= _timeout) {
+            return -1;
+        }
+    }
+
+    // TCP Client/Server
+    sprintf(cmd, "\x1bZ%X%04d", _cid, length);
+    _wifi->send(cmd, strlen(cmd));
+    return _wifi->send(data, length, GSwifi::RES_NORMAL);
+}
+
+// -1 if unsuccessful, else number of bytes written
+int TCPSocketConnection::send_all(char* data, int length)
+{
+    char cmd[CFG_CMD_SIZE];
+    Timer tmr;
+    int idx = 0;
+    tmr.start();
+
+    // TCP Client/Server
+    sprintf(cmd, "\x1bZ%X%04d", _cid, length);
+    _wifi->send(cmd, strlen(cmd));
+
+    while ((tmr.read_ms() < _timeout) || _blocking) {
+
+        idx += _wifi->send(data, length, GSwifi::RES_NORMAL);
+
+        if (idx == -1) return -1;
+        if (idx == length)
+            return idx;
+    }
+    return (idx == 0) ? -1 : idx;
+}
+
+// -1 if unsuccessful, else number of bytes received
+int TCPSocketConnection::receive(char* data, int length)
+{
+    Timer tmr;
+    int time = -1;
+    
+    
+    if (!_blocking) {
+        tmr.start();
+        while (time < _timeout + 20) {
+            if (_wifi->readable(_cid)) {
+                break;
+            }
+            time = tmr.read_ms();
+        }
+        if (time >= _timeout + 20) {
+            return -1;
+        }
+    }
+
+
+    while(!_wifi->readable(_cid));
+    int nb_available = _wifi->readable(_cid);
+    for (int i = 0; i < min(nb_available, length); i++) {
+        data[i] = _wifi->getc(_cid);
+    }
+
+    return min(nb_available, length);
+}
+
+
+// -1 if unsuccessful, else number of bytes received
+int TCPSocketConnection::receive_all(char* data, int length)
+{
+    Timer tmr;
+    int idx = 0;
+    int time = -1;
+
+    tmr.start();
+    
+    while (time < _timeout || _blocking) {
+
+        int nb_available = _wifi->readable(_cid);
+        for (int i = 0; i < min(nb_available, length); i++) {
+            data[idx++] = _wifi->getc(_cid);
+        }
+
+        if (idx == length)
+            break;
+
+        time = tmr.read_ms();
+    }
+
+    return (idx == 0) ? -1 : idx;
+}
+
+void TCPSocketConnection::confCID (int cid) {
+    char *ip;
+    int port;
+    _server = true;
+    _cid = cid;
+    if (_wifi->readRemote(_cid, &ip, &port)) {
+        set_address(ip, port);
+    }
+}