Merge pull request #14 from sandeepmistry/socket-urc-available

Use socket URC's to determine available socket data

Author: agdl

src/GSMClient.cpp

@@ -45,9 +45,10 @@ GSMClient::GSMClient(int socket, bool synch) :
   _port(0),
   _ssl(false),
   _writeSync(true),
-  _peek(-1)
+  _peek(-1),
+  _available(0)
 {
-   MODEM.addUrcHandler(this);
+  MODEM.addUrcHandler(this);
 }
 
 GSMClient::~GSMClient()
@@ -363,6 +364,9 @@ int GSMClient::read(uint8_t *buf, size_t size)
     buf[i] = (n1 << 4) | n2;
   }
 
+  _available = 0;
+  MODEM.poll();
+
   return size;
 }
 
@@ -395,24 +399,9 @@ int GSMClient::available()
     return 0;
   }
 
-  String response;
-
-  MODEM.sendf("AT+USORD=%d,0", _socket, 0);
-  if (MODEM.waitForResponse(10000, &response) == 1) {
-    if (response.startsWith("+USORD: ")) {
-      int commaIndex = response.indexOf(',');
-
-      if (commaIndex != -1) {
-        response.remove(0, commaIndex + 1);
-
-        return response.toInt();
-      }
-    }
-  } else {
-    _socket = -1;
-  }
+  MODEM.poll();
 
-  return 0;
+  return _available;
 }
 
 int GSMClient::peek()
@@ -448,14 +437,23 @@ void GSMClient::handleUrc(const String& urc)
     if (socket == _socket) {
       // this socket closed
       _socket = -1;
+      _available = 0;
     }
-  } else if (urc.startsWith("+UUSORD: ") && urc.endsWith(",4294967295")) {
-    // SSL disconnect
+  } else if (urc.startsWith("+UUSORD: ")) {
     int socket = urc.charAt(9) - '0';
 
     if (socket == _socket) {
-      // this socket closed
-      _socket = -1;
+      if (urc.endsWith(",4294967295")) {
+        // SSL disconnect
+        // this socket closed
+        _socket = -1;
+        _available = 0;
+      } else {
+        int commaIndex = urc.indexOf(',');
+        if (commaIndex != -1) {
+          _available = urc.substring(commaIndex + 1).toInt();
+        }
+      }
     }
   }
 }

src/GSMClient.h

@@ -24,7 +24,6 @@
 
 #include "Modem.h"
 
-
 class GSMClient : public Client, public ModemUrcHandler {
 
 public:
@@ -146,6 +145,7 @@ class GSMClient : public Client, public ModemUrcHandler {
   bool _writeSync;
   String _response;
   int _peek;
+  int _available;
 };
 
 #endif

src/GSMServer.cpp

@@ -29,7 +29,6 @@ enum {
   SERVER_STATE_WAIT_CLOSE_SOCKET
 };
 
-
 GSMServer::GSMServer(uint16_t port, bool synch) :
   _port(port),
   _synch(synch),
@@ -39,6 +38,7 @@ GSMServer::GSMServer(uint16_t port, bool synch) :
   for (int i = 0; i < MAX_CHILD_SOCKETS; i++) {
     _childSockets[i].socket = -1;
     _childSockets[i].accepted = false;
+    _childSockets[i].available = 0;
   }
 
   MODEM.addUrcHandler(this);
@@ -150,14 +150,21 @@ GSMClient GSMServer::available(bool synch)
       // no new accepted sockets, search for one with data to be read
       for (int i = 0; i < MAX_CHILD_SOCKETS; i++) {
         if (_childSockets[i].socket != -1) {
-          GSMClient client(_childSockets[i].socket, true);
+          // check if socket is still alive
+          MODEM.sendf("AT+USORD=%d,0", _childSockets[i].socket);
+          if (MODEM.waitForResponse(10000) != 1) {
+            // closed
+            _childSockets[i].socket = -1;
+            _childSockets[i].accepted = false;
+            _childSockets[i].available = 0;
+
+            continue;
+          }
 
-          if (client.available()) {
+          if (_childSockets[i].available) {
+            _childSockets[i].available = 0;
             socket = _childSockets[i].socket;
             break;
-          } else if (!client.connected()) {
-            _childSockets[i].socket = -1;
-            _childSockets[i].accepted = false;
           }
         }
       }
@@ -185,6 +192,8 @@ size_t GSMServer::write(const uint8_t *buf, size_t sz)
 {
   size_t written = 0;
 
+  MODEM.poll();
+
   if (_socket != -1) {
     for (int i = 0; i < MAX_CHILD_SOCKETS; i++) {
       if (_childSockets[i].socket != -1) {
@@ -223,6 +232,7 @@ void GSMServer::handleUrc(const String& urc)
       if (_childSockets[i].socket == -1) {
         _childSockets[i].socket = socket;
         _childSockets[i].accepted = true;
+        _childSockets[i].available = 0;
 
         break;
       }
@@ -234,6 +244,20 @@ void GSMServer::handleUrc(const String& urc)
       if (_childSockets[i].socket == socket) {
         _childSockets[i].socket = -1;
         _childSockets[i].accepted = false;
+        _childSockets[i].available = 0;
+
+        break;
+      }
+    }
+  } else if (urc.startsWith("+UUSORD: ")) {
+    int socket = urc.charAt(9) - '0';
+
+    for (int i = 0; i < MAX_CHILD_SOCKETS; i++) {
+      if (_childSockets[i].socket == socket) {
+        int commaIndex = urc.indexOf(',');
+        if (commaIndex != -1) {
+          _childSockets[i].available = urc.substring(commaIndex + 1).toInt();
+        }
 
         break;
       }

src/GSMServer.h

@@ -103,6 +103,7 @@ class GSMServer : public Server, public ModemUrcHandler {
   struct {
     int socket;
     bool accepted;
+    int available;
   } _childSockets[MAX_CHILD_SOCKETS];
 };
 

src/GSMUdp.cpp

@@ -23,6 +23,7 @@
 
 GSMUDP::GSMUDP() :
   _socket(-1),
+  _packetReceived(false),
   _txIp((uint32_t)0),
   _txHost(NULL),
   _txPort(0),
@@ -32,6 +33,12 @@ GSMUDP::GSMUDP() :
   _rxSize(0),
   _rxIndex(0)
 {
+  MODEM.addUrcHandler(this);
+}
+
+GSMUDP::~GSMUDP()
+{
+  MODEM.removeUrcHandler(this);
 }
 
 uint8_t GSMUDP::begin(uint16_t port)
@@ -161,6 +168,13 @@ size_t GSMUDP::write(const uint8_t *buffer, size_t size)
 
 int GSMUDP::parsePacket()
 {
+  MODEM.poll();
+
+  if (!_packetReceived) {
+    return 0;
+  }
+  _packetReceived = false;
+
   String response;
 
   MODEM.sendf("AT+USORF=%d,%d", _socket, sizeof(_rxBuffer));
@@ -218,6 +232,8 @@ int GSMUDP::parsePacket()
     _rxBuffer[i] = (n1 << 4) | n2;
   }
 
+  MODEM.poll();
+
   return _rxSize;
 }
 
@@ -274,3 +290,14 @@ uint16_t GSMUDP::remotePort()
 {
   return _rxPort;
 }
+
+void GSMUDP::handleUrc(const String& urc)
+{
+  if (urc.startsWith("+UUSORF: ")) {
+    int socket = urc.charAt(9) - '0';
+
+    if (socket == _socket) {
+      _packetReceived = true;
+    }
+  }
+}

src/GSMUdp.h

@@ -22,10 +22,14 @@
 
 #include <Udp.h>
 
-class GSMUDP : public UDP {
+#include "Modem.h"
+
+class GSMUDP : public UDP, public ModemUrcHandler {
 
 public:
   GSMUDP();  // Constructor
+  virtual ~GSMUDP();
+
   virtual uint8_t begin(uint16_t);  // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
   virtual void stop();  // Finish with the UDP socket
 
@@ -69,8 +73,11 @@ class GSMUDP : public UDP {
   // Return the port of the host who sent the current incoming packet
   virtual uint16_t remotePort();
 
+  virtual void handleUrc(const String& urc);
+
 private:
   int _socket;
+  bool _packetReceived;
 
   IPAddress _txIp;
   const char* _txHost;

src/Modem.h

@@ -76,7 +76,7 @@ class ModemClass {
   String _buffer;
   String* _responseDataStorage;
 
-  #define MAX_URC_HANDLERS 10
+  #define MAX_URC_HANDLERS 10 // 7 sockets + GPRS + GSMLocation + GSMVoiceCall
   static bool _debug;
   static ModemUrcHandler* _urcHandlers[MAX_URC_HANDLERS];
 };