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

Revert "Allman now (#6080)" (#6090)

Browse Source 
This reverts commit 98125f8860.
This commit is contained in:
Allman-astyler
2019-05-14 00:09:54 +02:00
committed by david gauchard
parent 98125f8860
commit eea9999dc5
255 changed files with 42650 additions and 50904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
libraries/ESP8266WiFi/src/WiFiClient.cpp
View File

@ -1,32 +1,32 @@
/*
WiFiClient.cpp - TCP/IP client for esp8266, mostly compatible
WiFiClient.cpp - TCP/IP client for esp8266, mostly compatible
with Arduino WiFi shield library
Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
This file is part of the esp8266 core for Arduino environment.
Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
This file is part of the esp8266 core for Arduino environment.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define LWIP_INTERNAL
extern "C"
{
#include "include/wl_definitions.h"
#include "osapi.h"
#include "ets_sys.h"
#include "include/wl_definitions.h"
#include "osapi.h"
#include "ets_sys.h"
}
#include "debug.h"
@ -46,27 +46,27 @@ uint16_t WiFiClient::_localPort = 0;
static bool defaultNoDelay = false; // false == Nagle enabled by default
static bool defaultSync = false;
bool getDefaultPrivateGlobalSyncValue()
bool getDefaultPrivateGlobalSyncValue ()
{
return defaultSync;
}
void WiFiClient::setDefaultNoDelay(bool noDelay)
void WiFiClient::setDefaultNoDelay (bool noDelay)
{
defaultNoDelay = noDelay;
}
void WiFiClient::setDefaultSync(bool sync)
void WiFiClient::setDefaultSync (bool sync)
{
defaultSync = sync;
}
bool WiFiClient::getDefaultNoDelay()
bool WiFiClient::getDefaultNoDelay ()
{
return defaultNoDelay;
}
bool WiFiClient::getDefaultSync()
bool WiFiClient::getDefaultSync ()
{
return defaultSync;
}
@ -76,14 +76,14 @@ WiFiClient* SList<WiFiClient>::_s_first = 0;
WiFiClient::WiFiClient()
: _client(0)
: _client(0)
{
_timeout = 5000;
WiFiClient::_add(this);
}
WiFiClient::WiFiClient(ClientContext* client)
: _client(client)
: _client(client)
{
_timeout = 5000;
_client->ref();
@ -97,9 +97,7 @@ WiFiClient::~WiFiClient()
{
WiFiClient::_remove(this);
if (_client)
{
_client->unref();
}
}
WiFiClient::WiFiClient(const WiFiClient& other)
@ -108,25 +106,19 @@ WiFiClient::WiFiClient(const WiFiClient& other)
_timeout = other._timeout;
_localPort = other._localPort;
if (_client)
{
_client->ref();
}
WiFiClient::_add(this);
}
WiFiClient& WiFiClient::operator=(const WiFiClient& other)
{
if (_client)
{
if (_client)
_client->unref();
}
_client = other._client;
_timeout = other._timeout;
_localPort = other._localPort;
if (_client)
{
_client->ref();
}
return *this;
}
@ -147,8 +139,7 @@ int WiFiClient::connect(const String& host, uint16_t port)
int WiFiClient::connect(IPAddress ip, uint16_t port)
{
if (_client)
{
if (_client) {
stop();
_client->unref();
_client = nullptr;
@ -159,8 +150,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
// ever calling tcp_err
// http://lists.gnu.org/archive/html/lwip-devel/2010-05/msg00001.html
netif* interface = ip_route(ip);
if (!interface)
{
if (!interface) {
DEBUGV("no route to host\r\n");
return 0;
}
@ -168,12 +158,9 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
tcp_pcb* pcb = tcp_new();
if (!pcb)
{
return 0;
}
if (_localPort > 0)
{
if (_localPort > 0) {
pcb->local_port = _localPort++;
}
@ -181,8 +168,7 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
_client->ref();
_client->setTimeout(_timeout);
int res = _client->connect(ip, port);
if (res == 0)
{
if (res == 0) {
_client->unref();
_client = nullptr;
return 0;
@ -194,45 +180,35 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
return 1;
}
void WiFiClient::setNoDelay(bool nodelay)
{
void WiFiClient::setNoDelay(bool nodelay) {
if (!_client)
{
return;
}
_client->setNoDelay(nodelay);
}
bool WiFiClient::getNoDelay() const
{
bool WiFiClient::getNoDelay() const {
if (!_client)
{
return false;
}
return _client->getNoDelay();
}
void WiFiClient::setSync(bool sync)
{
if (!_client)
{
return;
}
_client->setSync(sync);
}
bool WiFiClient::getSync() const
{
if (!_client)
{
return false;
}
return _client->getSync();
}
size_t WiFiClient::availableForWrite()
size_t WiFiClient::availableForWrite ()
{
return _client ? _client->availableForWrite() : 0;
return _client? _client->availableForWrite(): 0;
}
size_t WiFiClient::write(uint8_t b)
@ -279,14 +255,11 @@ size_t WiFiClient::write_P(PGM_P buf, size_t size)
int WiFiClient::available()
{
if (!_client)
{
return false;
}
int result = _client->getSize();
if (!result)
{
if (!result) {
optimistic_yield(100);
}
return result;
@ -295,9 +268,7 @@ int WiFiClient::available()
int WiFiClient::read()
{
if (!available())
{
return -1;
}
return _client->read();
}
@ -311,34 +282,26 @@ int WiFiClient::read(uint8_t* buf, size_t size)
int WiFiClient::peek()
{
if (!available())
{
return -1;
}
return _client->peek();
}
size_t WiFiClient::peekBytes(uint8_t *buffer, size_t length)
{
size_t WiFiClient::peekBytes(uint8_t *buffer, size_t length) {
size_t count = 0;
if (!_client)
{
if(!_client) {
return 0;
}
_startMillis = millis();
while ((available() < (int) length) && ((millis() - _startMillis) < _timeout))
{
while((available() < (int) length) && ((millis() - _startMillis) < _timeout)) {
yield();
}
if (available() < (int) length)
{
if(available() < (int) length) {
count = available();
}
else
{
} else {
count = length;
}
@ -348,38 +311,28 @@ size_t WiFiClient::peekBytes(uint8_t *buffer, size_t length)
bool WiFiClient::flush(unsigned int maxWaitMs)
{
if (!_client)
{
return true;
}
if (maxWaitMs == 0)
{
maxWaitMs = WIFICLIENT_MAX_FLUSH_WAIT_MS;
}
return _client->wait_until_sent(maxWaitMs);
}
bool WiFiClient::stop(unsigned int maxWaitMs)
{
if (!_client)
{
return true;
}
bool ret = flush(maxWaitMs); // virtual, may be ssl's
if (_client->close() != ERR_OK)
{
ret = false;
}
return ret;
}
uint8_t WiFiClient::connected()
{
if (!_client || _client->state() == CLOSED)
{
return 0;
}
return _client->state() == ESTABLISHED || available();
}
@ -387,9 +340,7 @@ uint8_t WiFiClient::connected()
uint8_t WiFiClient::status()
{
if (!_client)
{
return CLOSED;
}
return _client->state();
}
@ -401,9 +352,7 @@ WiFiClient::operator bool()
IPAddress WiFiClient::remoteIP()
{
if (!_client || !_client->getRemoteAddress())
{
return IPAddress(0U);
}
return _client->getRemoteAddress();
}
@ -411,9 +360,7 @@ IPAddress WiFiClient::remoteIP()
uint16_t WiFiClient::remotePort()
{
if (!_client)
{
return 0;
}
return _client->getRemotePort();
}
@ -421,9 +368,7 @@ uint16_t WiFiClient::remotePort()
IPAddress WiFiClient::localIP()
{
if (!_client)
{
return IPAddress(0U);
}
return IPAddress(_client->getLocalAddress());
}
@ -431,55 +376,50 @@ IPAddress WiFiClient::localIP()
uint16_t WiFiClient::localPort()
{
if (!_client)
{
return 0;
}
return _client->getLocalPort();
}
void WiFiClient::stopAll()
{
for (WiFiClient* it = _s_first; it; it = it->_next)
{
for (WiFiClient* it = _s_first; it; it = it->_next) {
it->stop();
}
}
void WiFiClient::stopAllExcept(WiFiClient* except)
void WiFiClient::stopAllExcept(WiFiClient* except)
{
for (WiFiClient* it = _s_first; it; it = it->_next)
{
if (it != except)
{
for (WiFiClient* it = _s_first; it; it = it->_next) {
if (it != except) {
it->stop();
}
}
}
void WiFiClient::keepAlive(uint16_t idle_sec, uint16_t intv_sec, uint8_t count)
void WiFiClient::keepAlive (uint16_t idle_sec, uint16_t intv_sec, uint8_t count)
{
_client->keepAlive(idle_sec, intv_sec, count);
}
bool WiFiClient::isKeepAliveEnabled() const
bool WiFiClient::isKeepAliveEnabled () const
{
return _client->isKeepAliveEnabled();
}
uint16_t WiFiClient::getKeepAliveIdle() const
uint16_t WiFiClient::getKeepAliveIdle () const
{
return _client->getKeepAliveIdle();
}
uint16_t WiFiClient::getKeepAliveInterval() const
uint16_t WiFiClient::getKeepAliveInterval () const
{
return _client->getKeepAliveInterval();
}
uint8_t WiFiClient::getKeepAliveCount() const
uint8_t WiFiClient::getKeepAliveCount () const
{
return _client->getKeepAliveCount();
}