1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-11 15:22:13 +03:00

Allman now (#6080)

* switch restyle script for CI

* remove confirmation

* restyle with allman
This commit is contained in:
Allman-astyler
2019-05-13 16:41:34 +02:00
committed by david gauchard
parent 625c3a62c4
commit 98125f8860
255 changed files with 51238 additions and 42984 deletions

View File

@ -1,31 +1,31 @@
/*
WiFiServer.cpp - TCP/IP server for esp8266, mostly compatible
WiFiServer.cpp - TCP/IP server 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 "osapi.h"
#include "ets_sys.h"
#include "osapi.h"
#include "ets_sys.h"
}
#include "debug.h"
@ -38,47 +38,53 @@ extern "C" {
#include <include/ClientContext.h>
WiFiServer::WiFiServer(const IPAddress& addr, uint16_t port)
: _port(port)
, _addr(addr)
, _pcb(nullptr)
, _unclaimed(nullptr)
, _discarded(nullptr)
: _port(port)
, _addr(addr)
, _pcb(nullptr)
, _unclaimed(nullptr)
, _discarded(nullptr)
{
}
WiFiServer::WiFiServer(uint16_t port)
: _port(port)
, _addr(IP_ANY_TYPE)
, _pcb(nullptr)
, _unclaimed(nullptr)
, _discarded(nullptr)
: _port(port)
, _addr(IP_ANY_TYPE)
, _pcb(nullptr)
, _unclaimed(nullptr)
, _discarded(nullptr)
{
}
void WiFiServer::begin() {
begin(_port);
void WiFiServer::begin()
{
begin(_port);
}
void WiFiServer::begin(uint16_t port) {
void WiFiServer::begin(uint16_t port)
{
close();
_port = port;
err_t err;
tcp_pcb* pcb = tcp_new();
if (!pcb)
{
return;
}
pcb->so_options |= SOF_REUSEADDR;
// (IPAddress _addr) operator-converted to (const ip_addr_t*)
err = tcp_bind(pcb, _addr, _port);
if (err != ERR_OK) {
if (err != ERR_OK)
{
tcp_close(pcb);
return;
}
tcp_pcb* listen_pcb = tcp_listen(pcb);
if (!listen_pcb) {
if (!listen_pcb)
{
tcp_close(pcb);
return;
}
@ -87,11 +93,13 @@ void WiFiServer::begin(uint16_t port) {
tcp_arg(listen_pcb, (void*) this);
}
void WiFiServer::setNoDelay(bool nodelay) {
_noDelay = nodelay? _ndTrue: _ndFalse;
void WiFiServer::setNoDelay(bool nodelay)
{
_noDelay = nodelay ? _ndTrue : _ndFalse;
}
bool WiFiServer::getNoDelay() {
bool WiFiServer::getNoDelay()
{
switch (_noDelay)
{
case _ndFalse: return false;
@ -100,15 +108,20 @@ bool WiFiServer::getNoDelay() {
}
}
bool WiFiServer::hasClient() {
bool WiFiServer::hasClient()
{
if (_unclaimed)
{
return true;
}
return false;
}
WiFiClient WiFiServer::available(byte* status) {
WiFiClient WiFiServer::available(byte* status)
{
(void) status;
if (_unclaimed) {
if (_unclaimed)
{
WiFiClient result(_unclaimed);
_unclaimed = _unclaimed->next();
result.setNoDelay(getNoDelay());
@ -120,29 +133,37 @@ WiFiClient WiFiServer::available(byte* status) {
return WiFiClient();
}
uint8_t WiFiServer::status() {
uint8_t WiFiServer::status()
{
if (!_pcb)
{
return CLOSED;
}
return _pcb->state;
}
void WiFiServer::close() {
if (!_pcb) {
return;
void WiFiServer::close()
{
if (!_pcb)
{
return;
}
tcp_close(_pcb);
_pcb = nullptr;
}
void WiFiServer::stop() {
void WiFiServer::stop()
{
close();
}
size_t WiFiServer::write(uint8_t b) {
size_t WiFiServer::write(uint8_t b)
{
return write(&b, 1);
}
size_t WiFiServer::write(const uint8_t *buffer, size_t size) {
size_t WiFiServer::write(const uint8_t *buffer, size_t size)
{
// write to all clients
// not implemented
(void) buffer;
@ -151,17 +172,23 @@ size_t WiFiServer::write(const uint8_t *buffer, size_t size) {
}
template<typename T>
T* slist_append_tail(T* head, T* item) {
T* slist_append_tail(T* head, T* item)
{
if (!head)
{
return item;
}
T* last = head;
while(last->next())
while (last->next())
{
last = last->next();
}
last->next(item);
return head;
}
long WiFiServer::_accept(tcp_pcb* apcb, long err) {
long WiFiServer::_accept(tcp_pcb* apcb, long err)
{
(void) err;
DEBUGV("WS:ac\r\n");
ClientContext* client = new ClientContext(apcb, &WiFiServer::_s_discard, this);
@ -170,16 +197,19 @@ long WiFiServer::_accept(tcp_pcb* apcb, long err) {
return ERR_OK;
}
void WiFiServer::_discard(ClientContext* client) {
void WiFiServer::_discard(ClientContext* client)
{
(void) client;
// _discarded = slist_append_tail(_discarded, client);
DEBUGV("WS:dis\r\n");
}
long WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, long err) {
long WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, long err)
{
return reinterpret_cast<WiFiServer*>(arg)->_accept(newpcb, err);
}
void WiFiServer::_s_discard(void* server, ClientContext* ctx) {
void WiFiServer::_s_discard(void* server, ClientContext* ctx)
{
reinterpret_cast<WiFiServer*>(server)->_discard(ctx);
}