arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-20 21:01:25 +03:00
Code Activity

WiFi libraries: Bugfix on TestReport 12.01.2012

Browse Source
This commit is contained in:
Mimmo La Fauci
2012-02-04 12:29:12 +01:00
parent b61427ddc8
commit 00c36dc563
7 changed files with 106 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
WiFi/WiFiClient.cpp
View File

@ -11,6 +11,7 @@ extern "C" {
#include "WiFiServer.h"
#include "server_drv.h"
uint16_t WiFiClient::_srcport = 1024;
WiFiClient::WiFiClient() : _sock(MAX_SOCK_NUM) {
@ -41,7 +42,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port) {
_sock = getFirstSocket();
if (_sock != NO_SOCKET_AVAIL)
{
ServerDrv::StartClient(uint32_t(ip), port, _sock);
ServerDrv::startClient(uint32_t(ip), port, _sock);
WiFiClass::_state[_sock] = _sock;
}else{
return 0;
@ -106,11 +107,13 @@ void WiFiClient::flush() {
}
void WiFiClient::stop() {
INFO("1)Stop WiFi client sock:%d state:%d status:%d", _sock, WiFiClass::_state[_sock], status());
if (_sock == 255)
return;
// attempt to close the connection gracefully (send a FIN to other side)
disconnect(WiFiClass::_state[_sock]);
ServerDrv::stopClient(_sock);
unsigned long start = millis();
// wait a second for the connection to close
@ -119,9 +122,13 @@ void WiFiClient::stop() {
// if it hasn't closed, close it forcefully
if (status() != CLOSED)
close(_sock);
{
//TODO force close
//close(_sock);
}
WiFiClass::_server_port[_sock] = 0;
INFO("2)Stop WiFi client sock:%d state:%d status:%d", _sock, WiFiClass::_state[_sock], status());
_sock = 255;
}
@ -130,6 +137,7 @@ uint8_t WiFiClient::connected() {
return 0;
} else {
uint8_t s = status();
INFO("Client status: %d", s);
return !(s == LISTEN || s == CLOSED || s == FIN_WAIT_1 || s == FIN_WAIT_2 ||
(s == CLOSE_WAIT && !available()));
}
@ -139,7 +147,7 @@ uint8_t WiFiClient::status() {
if (_sock == 255) {
return CLOSED;
} else {
return ServerDrv::getState(_sock);
return ServerDrv::getClientState(_sock);
}
}