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

restore proper arduino Client:: & Wire:: API (#5969)

Browse Source
This commit is contained in:
david gauchard
2019-04-26 22:05:46 +02:00
committed by GitHub
parent 5dd780c571
commit cdb549572d
15 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ int WiFiClient::connect(const String& host, uint16_t port)
return connect(host.c_str(), port);
}
int WiFiClient::connect(CONST IPAddress& ip, uint16_t port)
int WiFiClient::connect(IPAddress ip, uint16_t port)
{
if (_client) {
stop();

26
libraries/ESP8266WiFi/src/WiFiClient.h
View File

@ -53,29 +53,31 @@ public:
WiFiClient& operator=(const WiFiClient&);
uint8_t status();
virtual int connect(CONST IPAddress& ip, uint16_t port);
virtual int connect(const char *host, uint16_t port);
virtual int connect(IPAddress ip, uint16_t port) override;
virtual int connect(const char *host, uint16_t port) override;
virtual int connect(const String& host, uint16_t port);
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *buf, size_t size);
virtual size_t write(uint8_t) override;
virtual size_t write(const uint8_t *buf, size_t size) override;
virtual size_t write_P(PGM_P buf, size_t size);
size_t write(Stream& stream);
// This one is deprecated, use write(Stream& instead)
size_t write(Stream& stream, size_t unitSize) __attribute__ ((deprecated));
virtual int available();
virtual int read();
virtual int read(uint8_t *buf, size_t size);
virtual int peek();
virtual int available() override;
virtual int read() override;
virtual int read(uint8_t *buf, size_t size) override;
virtual int peek() override;
virtual size_t peekBytes(uint8_t *buffer, size_t length);
size_t peekBytes(char *buffer, size_t length) {
return peekBytes((uint8_t *) buffer, length);
}
virtual bool flush(unsigned int maxWaitMs = 0);
virtual bool stop(unsigned int maxWaitMs = 0);
virtual uint8_t connected();
virtual operator bool();
virtual void flush() override { (void)flush(0); }
virtual void stop() override { (void)stop(0); }
bool flush(unsigned int maxWaitMs);
bool stop(unsigned int maxWaitMs);
virtual uint8_t connected() override;
virtual operator bool() override;
IPAddress remoteIP();
uint16_t remotePort();

2
libraries/ESP8266WiFi/src/WiFiClientSecureAxTLS.cpp
View File

@ -95,7 +95,7 @@ WiFiClientSecure::WiFiClientSecure(ClientContext* client, bool usePMEM,
_ssl->connectServer(client, _timeout);
}
int WiFiClientSecure::connect(CONST IPAddress& ip, uint16_t port)
int WiFiClientSecure::connect(IPAddress ip, uint16_t port)
{
if (!WiFiClient::connect(ip, port)) {
return 0;

5
libraries/ESP8266WiFi/src/WiFiClientSecureAxTLS.h
View File

@ -35,7 +35,7 @@ public:
WiFiClientSecure() __attribute__((deprecated("Upgrade to BearSSL is advised, check https://github.com/esp8266/Arduino/blob/master/libraries/ESP8266WiFi/src/WiFiClientSecure.h#L25-L99")));
~WiFiClientSecure() override;
int connect(CONST IPAddress& ip, uint16_t port) override;
int connect(IPAddress ip, uint16_t port) override;
int connect(const String& host, uint16_t port) override;
int connect(const char* name, uint16_t port) override;
@ -51,7 +51,8 @@ public:
int read() override;
int peek() override;
size_t peekBytes(uint8_t *buffer, size_t length) override;
bool stop(unsigned int maxWaitMs = 0) override;
void stop() override { (void)stop(0); }
bool stop(unsigned int maxWaitMs);
bool setCACert(const uint8_t* pk, size_t size);
bool setCertificate(const uint8_t* pk, size_t size);

2
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.cpp
View File

@ -210,7 +210,7 @@ bool WiFiClientSecure::flush(unsigned int maxWaitMs) {
return WiFiClient::flush(maxWaitMs);
}
int WiFiClientSecure::connect(CONST IPAddress& ip, uint16_t port) {
int WiFiClientSecure::connect(IPAddress ip, uint16_t port) {
if (!WiFiClient::connect(ip, port)) {
return 0;
}

8
libraries/ESP8266WiFi/src/WiFiClientSecureBearSSL.h
View File

@ -37,7 +37,7 @@ class WiFiClientSecure : public WiFiClient {
WiFiClientSecure(const WiFiClientSecure &rhs);
~WiFiClientSecure() override;
int connect(CONST IPAddress& ip, uint16_t port) override;
int connect(IPAddress ip, uint16_t port) override;
int connect(const String& host, uint16_t port) override;
int connect(const char* name, uint16_t port) override;
@ -56,8 +56,10 @@ class WiFiClientSecure : public WiFiClient {
int read() override;
int peek() override;
size_t peekBytes(uint8_t *buffer, size_t length) override;
bool flush(unsigned int maxWaitMs = 0) override;
bool stop(unsigned int maxWaitMs = 0) override;
bool flush(unsigned int maxWaitMs);
bool stop(unsigned int maxWaitMs);
void flush() override { (void)flush(0); }
void stop() override { (void)stop(0); }
// Allow sessions to be saved/restored automatically to a memory area
void setSession(Session *session) { _session = session; }

4
libraries/ESP8266WiFi/src/WiFiUdp.cpp
View File

@ -231,7 +231,7 @@ void WiFiUDP::flush()
endPacket();
}
IPAddress WiFiUDP::remoteIP() const
IPAddress WiFiUDP::remoteIP()
{
if (!_ctx)
return INADDR_ANY;
@ -239,7 +239,7 @@ IPAddress WiFiUDP::remoteIP() const
return _ctx->getRemoteAddress();
}
uint16_t WiFiUDP::remotePort() const
uint16_t WiFiUDP::remotePort()
{
if (!_ctx)
return 0;

4
libraries/ESP8266WiFi/src/WiFiUdp.h
View File

@ -95,9 +95,9 @@ public:
void flush() override; // Finish reading the current packet
// Return the IP address of the host who sent the current incoming packet
IPAddress remoteIP() const override;
IPAddress remoteIP() override;
// Return the port of the host who sent the current incoming packet
uint16_t remotePort() const override;
uint16_t remotePort() override;
// Return the destination address for incoming packets,
// useful to distinguish multicast and ordinary packets
IPAddress destinationIP() const;