mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-20 21:01:25 +03:00
WiFi libraries: Bugfix on TestReport 12.01.2012
This commit is contained in:
@ -1,6 +1,10 @@
|
||||
#include <string.h>
|
||||
#include "server_drv.h"
|
||||
|
||||
extern "C" {
|
||||
#include "utility/debug.h"
|
||||
}
|
||||
|
||||
#include "WiFi.h"
|
||||
#include "WiFiClient.h"
|
||||
#include "WiFiServer.h"
|
||||
@ -17,7 +21,7 @@ void WiFiServer::begin()
|
||||
uint8_t _sock = WiFiClass::getSocket();
|
||||
if (_sock != NO_SOCKET_AVAIL)
|
||||
{
|
||||
ServerDrv::StartServer(_port, _sock);
|
||||
ServerDrv::startServer(_port, _sock);
|
||||
WiFiClass::_server_port[_sock] = _port;
|
||||
}
|
||||
}
|
||||
@ -25,18 +29,34 @@ void WiFiServer::begin()
|
||||
WiFiClient WiFiServer::available(byte* status)
|
||||
{
|
||||
//accept();
|
||||
static byte tmp_cli_status = 0;
|
||||
static byte tmp_ser_status = 0;
|
||||
static int cycle = 0;
|
||||
|
||||
for (int sock = 0; sock < MAX_SOCK_NUM; sock++)
|
||||
{
|
||||
if (WiFiClass::_server_port[sock] != 0)
|
||||
if (WiFiClass::_server_port[sock] == _port)
|
||||
{
|
||||
WiFiClient client(sock);
|
||||
int _status = client.status();
|
||||
uint8_t _status = client.status();
|
||||
uint8_t _ser_status = this->status();
|
||||
if ((tmp_cli_status != _status)||(tmp_ser_status != _ser_status))
|
||||
{
|
||||
INFO("%d)Sock: %d Client Status: %d Server Status: %d port: %d", cycle, sock, _status, _ser_status, WiFiClass::_server_port[sock]);
|
||||
tmp_cli_status = _status;
|
||||
tmp_ser_status = _ser_status;
|
||||
cycle = 0;
|
||||
}else{
|
||||
++cycle;
|
||||
}
|
||||
if (status != NULL)
|
||||
*status = _status;
|
||||
|
||||
if (WiFiClass::_server_port[sock] == _port &&
|
||||
_status == ESTABLISHED)
|
||||
//server not in listen state, restart it
|
||||
if (this->status()==0)
|
||||
ServerDrv::startServer(_port, sock);
|
||||
|
||||
if (_status == ESTABLISHED)
|
||||
{
|
||||
return client; //TODO
|
||||
}
|
||||
@ -46,6 +66,11 @@ WiFiClient WiFiServer::available(byte* status)
|
||||
return WiFiClient(255);
|
||||
}
|
||||
|
||||
uint8_t WiFiServer::status() {
|
||||
return ServerDrv::getServerState(0);
|
||||
}
|
||||
|
||||
|
||||
size_t WiFiServer::write(uint8_t b)
|
||||
{
|
||||
return write(&b, 1);
|
||||
|
Reference in New Issue
Block a user