Fix some regressions introduced by the new socket buffer

The last chunk of data received on the socket before it closes was not
returned. The URC caused the socket to be in the closed state.

Author: sandeepmistry

src/GSMClient.cpp

@@ -17,6 +17,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include "Modem.h"
+
 #include "utility/GSMSocketBuffer.h"
 
 #include "GSMClient.h"
@@ -48,12 +50,10 @@ GSMClient::GSMClient(int socket, bool synch) :
   _ssl(false),
   _writeSync(true)
 {
-  MODEM.addUrcHandler(this);
 }
 
 GSMClient::~GSMClient()
 {
-  MODEM.removeUrcHandler(this);
 }
 
 int GSMClient::ready()
@@ -309,6 +309,13 @@ uint8_t GSMClient::connected()
     return 0;
   }
 
+  // call available to update socket state
+  if (GSMSocketBuffer.available(_socket) < 0) {
+    stop();
+
+    return 0;
+  }
+
   return 1;
 }
 
@@ -395,27 +402,3 @@ void GSMClient::stop()
   GSMSocketBuffer.close(_socket);
   _socket = -1;
 }
-
-void GSMClient::handleUrc(const String& urc)
-{
-  if (urc.startsWith("+UUSOCL: ")) {
-    int socket = urc.charAt(urc.length() - 1) - '0';
-
-    if (socket == _socket) {
-      // this socket closed
-      GSMSocketBuffer.close(_socket);
-      _socket = -1;
-    }
-  } else if (urc.startsWith("+UUSORD: ")) {
-    int socket = urc.charAt(9) - '0';
-
-    if (socket == _socket) {
-      if (urc.endsWith(",4294967295")) {
-        // SSL disconnect
-        // this socket closed
-        GSMSocketBuffer.close(_socket);
-        _socket = -1;
-      }
-    }
-  }
-}

src/GSMClient.h

@@ -22,9 +22,7 @@
 
 #include <Client.h>
 
-#include "Modem.h"
-
-class GSMClient : public Client, public ModemUrcHandler {
+class GSMClient : public Client {
 
 public:
 
@@ -128,8 +126,6 @@ class GSMClient : public Client, public ModemUrcHandler {
    */
   void stop();
 
-  virtual void handleUrc(const String& urc);
-
 private:
   int connect();