#9

examples/WebServer/WebServer.ino

@@ -92,6 +92,7 @@ void loop()
 
     // close the connection:
     client.stop();
+    server.closeAllClientSocket();
     Serial.println("Client disconnected");
   }
 }

examples/WebServerAP/WebServerAP.ino

@@ -71,6 +71,7 @@ void loop()
 
     // close the connection
     client.stop();
+    server.closeAllClientSocket();
     Serial.println("Client disconnected");
   }
 }

src/WizFi310Client.cpp

@@ -107,16 +107,9 @@ int WiFiClient::read()
     if (!available())
         return -1;
 
-    bool connClose = false;
-    if( WizFi310Drv::getData(_sock, &b, false, &connClose) == false )
+    if( WizFi310Drv::getData(_sock, &b) == false )
         return -1;
 
-    if (connClose)
-    {
-        WizFi310Drv::_state[_sock] = NA_STATE;
-        _sock = 255;
-    }
-
     return b;
 }
 
@@ -133,13 +126,8 @@ int WiFiClient::peek()
     if (!available())
         return -1;
 
-    bool connClose = false;
-    WizFi310Drv::getData(_sock, &b, true, &connClose);
-
-    if (connClose)
-    {
-        WizFi310Drv::_state[_sock] = NA_STATE;
-        _sock = 255;
+    while (available()){
+        WizFi310Drv::getData(_sock, &b);
     }
 
     return b;
@@ -157,6 +145,7 @@ void WiFiClient::stop()
         return;
 
     LOGINFO1(F("Disconnecting "), _sock);
+    peek();
 
     WizFi310Drv::stopClient(_sock);
 

src/WizFi310Server.cpp

@@ -80,3 +80,8 @@ uint8_t WiFiServer::getFirstSocket()
     }
     return SOCK_NOT_AVAIL;
 }
+
+uint8_t WiFiServer::closeAllClientSocket()
+{
+    WizFi310Drv::closeAllClientSocket();
+}

src/WizFi310Server.h

@@ -32,6 +32,7 @@ class WiFiServer : public Server
     uint8_t status();
 
     uint8_t getFirstSocket();
+    uint8_t closeAllClientSocket();
 
     using Print::write;
 

src/WizFi310Udp.cpp

@@ -132,8 +132,7 @@ int WiFiUDP::read()
     if (!available())
         return -1;
 
-    bool connClose = false;
-    WizFi310Drv::getData(_sock, &b, false, &connClose);
+    WizFi310Drv::getData(_sock, &b);
 
     return b;
 }
@@ -156,7 +155,11 @@ int WiFiUDP::peek()
 {
   uint8_t b;
   if (!available())
-    return -1;
+      return -1;
+
+  while (available()){
+      WizFi310Drv::getData(_sock, &b);
+  }
 
   return b;
 }

src/utility/WizFi310Drv.cpp

@@ -518,7 +518,7 @@ void WizFi310Drv::stopClient(uint8_t sock)
         return;
 
     // Check socket
-    if (SendCmdWithTag("AT+SMGMT=?\r", "Number of Sockets : 0", "", 1000) == TAG_OK) {
+    if (SendCmdWithTag("AT+SMGMT=?\r", "Number of Sockets : 0", "[OK]\r\n", 1000) == TAG_OK) {
         _state[sock] = NA_STATE;
         m_esc_state = ESC_IDLE;
         ringBuf.reset();
@@ -694,14 +694,14 @@ void WizFi310Drv::parsingData(uint8_t recv_data)
         else m_esc_state = ESC_IDLE;
         break;
     case ESC_RECV_DATA:
-//        LOGDEBUG("ESC_RECV_DATA");
-//        if( ringBuf.available() >= (CMD_BUFFER_SIZE - 50) )
-//        {
-//          LOGDEBUG2("ringBuf threshold is over", (char)recv_data, ringBuf.available() );
-//          m_recved_len--;
-//          break;
-//        }
-
+        // For Debug
+        //LOGDEBUG("ESC_RECV_DATA");
+        //if( ringBuf.available() >= (CMD_BUFFER_SIZE - 50) )
+        //{
+        //  LOGDEBUG2("ringBuf threshold is over", (char)recv_data, ringBuf.available() );
+        //  m_recved_len--;
+        //  break;
+        //}
         ringBuf.write(recv_data);
         m_recved_len--;
 
@@ -785,7 +785,7 @@ void WizFi310Drv::parsingData(uint8_t recv_data)
     }
 }
 
-bool WizFi310Drv::getData(uint8_t connId, uint8_t *data, bool peek, bool* connClose)
+bool WizFi310Drv::getData(uint8_t connId, uint8_t *data)
 {
     int ch;
 
@@ -966,6 +966,8 @@ int WizFi310Drv::SendCmdWithTag(const char* cmd, const char* tag, const char* ta
 
     WizFi310Serial->print(cmd);
     int idx = readUntil(timeout, tag, tag2);
+    // kaizen 20180308 For remove AT command response
+    ringBuf.reset();
 
     LOGDEBUG1(F("---------------------------------------------- >"), idx);
     LOGDEBUG();
@@ -1042,4 +1044,35 @@ void WizFi310Drv::wizfiEmptyBuf(bool warn)
     }
 }
 
+
+void WizFi310Drv::closeAllClientSocket()
+{
+    char buff[CMD_BUFFER_SIZE];
+    char *token;
+    int  sock_cnt=0;
+    int  server_sock[MAX_SOCK_NUM]= { NA_STATE, NA_STATE, NA_STATE, NA_STATE,
+                                      NA_STATE, NA_STATE, NA_STATE, NA_STATE };
+
+    sendCmd(F("AT+SMGMT=?\r"));
+    // Number of Sockets : 1 (SCID/Mode/Remote/Local/DataMode)
+    getResponse(buff,CMD_BUFFER_SIZE, 1);
+    token = strtok(buff, ":");
+    token = strtok(NULL, "(");
+    sock_cnt = atoi(token);
+
+    for(int i=0; i<sock_cnt; i++){
+        getResponse(buff,CMD_BUFFER_SIZE, 1);
+        if( strstr(buff,"TSN") > 0 ){
+            token = strtok(buff,"/");
+            server_sock[i] = atoi(token);
+        }
+    }
+
+    for(int i=0; i<sock_cnt; i++){
+        if(server_sock[i] == NA_STATE){
+            stopClient(i);
+        }
+    }
+}
+
 WizFi310Drv wizfi310Drv;

src/utility/WizFi310Drv.h

@@ -128,7 +128,7 @@ class WizFi310Drv
     ////////////////////////////////////////////////////////////////////////////
     static uint16_t availData  ();
     static void     parsingData(uint8_t recv_data);
-    static bool     getData    (uint8_t connId, uint8_t *data, bool peek, bool* connClose);
+    static bool     getData    (uint8_t connId, uint8_t *data);
     static int      getDataBuf (uint8_t connId, uint8_t *buf, uint16_t bufSize);
     static bool     sendData   (uint8_t sock, const uint8_t *data, uint16_t len);
     static bool     sendData   (uint8_t sock, const __FlashStringHelper *data, uint16_t len, bool appendCrLf=false);
@@ -137,6 +137,9 @@ class WizFi310Drv
     static uint16_t getRemotePort();
     static uint8_t  getFirstSocket();
 
+    static void      closeAllClientSocket();
+
+
     static Stream *WizFi310Serial;
 
     static long _bufPos;