Additions to WiFiClient and WiFiServer #404

bbx10 · 2017-05-30T02:02:27Z

Required for WebServer and DNSServer libraries. May be use by other libraries and apps.

Required for WebServer and/or DNSServer libraries

me-no-dev · 2017-05-30T08:14:38Z

libraries/WiFi/src/WiFiServer.cpp

@@ -103,8 +104,16 @@ bool WiFiServer::hasClient() {
 }

 void WiFiServer::end(){
-  close(sockfd);
+  lwip_close_r(sockfd);


oh breaks with the other close...

me-no-dev · 2017-05-30T08:15:55Z

libraries/WiFi/src/WiFiClient.cpp

+{
+    return write(buf, size);
+}
+


this is not official Arduino API is it? We do not really have _P anything ;)

ESP8266WebServer has *_P methods so I added support for them in the ESP32 version.

void WebServer::send_P(int code, PGM_P content_type, PGM_P content) { size_t contentLength = 0; if (content != NULL) { contentLength = strlen_P(content); } String header; char type[64]; memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type)); _prepareHeader(header, code, (const char* )type, contentLength); _currentClient.write(header.c_str(), header.length()); sendContent_P(content); } void WebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) { String header; char type[64]; memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type)); _prepareHeader(header, code, (const char* )type, contentLength); sendContent(header); sendContent_P(content, contentLength); } void WebServer::send(int code, char* content_type, const String& content) { send(code, (const char*)content_type, content); } void WebServer::send(int code, const String& content_type, const String& content) { send(code, (const char*)content_type.c_str(), content); } void WebServer::sendContent(const String& content) { const char * footer = "\r\n"; size_t len = content.length(); if(_chunked) { char * chunkSize = (char *)malloc(11); if(chunkSize){ sprintf(chunkSize, "%x%s", len, footer); _currentClient.write(chunkSize, strlen(chunkSize)); free(chunkSize); } } _currentClient.write(content.c_str(), len); if(_chunked){ _currentClient.write(footer, 2); } } void WebServer::sendContent_P(PGM_P content) { sendContent_P(content, strlen_P(content)); } void WebServer::sendContent_P(PGM_P content, size_t size) { const char * footer = "\r\n"; if(_chunked) { char * chunkSize = (char *)malloc(11); if(chunkSize){ sprintf(chunkSize, "%x%s", size, footer); _currentClient.write(chunkSize, strlen(chunkSize)); free(chunkSize); } } #ifdef ESP8266 _currentClient.write_P(content, size); #else // TODO add ESP32 WiFiClient::write_P _currentClient.write(content, size); #endif if(_chunked){ _currentClient.write(footer, 2); } }

_P methods imply PROGMEM an we do not have PROGMEM on esp32

@copercini Compare pgmspace.h on ESP32 vs. ESP8266. There is no support for PROGMEM on ESP32 so pgmspace.h neuters the _P functions to their non _P equivalents.

But to avoid breaking lots of apps and libraries is would be good to translate _P functions to something that works on ESP32. Instead of making this change, libs and apps would have to do this.

#ifdef ESP8266
_currentClient.write_P(content, size);
#else
_currentClient.write(content, size);
#endif

If there are many occurrences, perhaps #define write_P write would do the job. But it would be less work and fewer breakage issues if write_P() is added even though it does the same thing as write().

I can not agree to bloat the classes unnecessary just for the sake of compatibility with everything. We have to add all of the _P methods then to Print, Stream and whatever else has them on ESP8266... bad idea!

I can agree to mark them deprecated and remove at later point.

What approach would you suggest library authors take when it comes to writing code which supports both the ESP8266 and the ESP32?

What would happen if we separate code like it's with WiFi? will all of the source files be included even if not used?

At link time, only the functions which were referenced will be left in the program, if -ffunction-section and -gc-sections options are used.

Instead of adding write_P, how about adding #define write_P write to pgmspace.h?

#define write_P write will not lead to proper client.write_P. @igrr correct me if I'm wrong, but that is what I believe the result will be

me-no-dev · 2017-05-30T08:16:56Z

libraries/WiFi/src/WiFiServer.cpp

  sockfd = -1;
  _listening = false;
 }

+void WiFiServer::close(){


I think we should go with one or the other ;) What's the official API for this?

ESP8266WiFiServer has close() and stop(). ESP32 WiFiServer has end(). ESP8266WebServer calls close. I chose to put all three for maximum backwards compatibility.

void WebServer::close() { #ifdef ESP8266 _server.close(); #else // TODO add ESP32 WiFiServer::close() _server.end(); #endif }

ESP32 should actually always use stop() as that is the official Arduino API. close and end should e deprecated.

OK, I can remove close and end.

bestpika · 2017-06-14T09:10:38Z

Can't compile...

#include <WiFi.h>

void setup() {}
void loop() {}

In file included from C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFi.h:37:0,

                 from C:\Users\...\AppData\Local\Temp\arduino_modified_sketch_637679\sketch_jun14c.ino:1:

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:93:15: error: 'IPAddress WiFiClient::localIP() const' cannot be overloaded

     IPAddress localIP() const;

               ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:88:15: error: with 'IPAddress WiFiClient::localIP() const'

     IPAddress localIP() const;

               ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:94:15: error: 'IPAddress WiFiClient::localIP(int) const' cannot be overloaded

     IPAddress localIP(int fd) const;

               ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:89:15: error: with 'IPAddress WiFiClient::localIP(int) const'

     IPAddress localIP(int fd) const;

               ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:95:14: error: 'uint16_t WiFiClient::localPort() const' cannot be overloaded

     uint16_t localPort() const;

              ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:90:14: error: with 'uint16_t WiFiClient::localPort() const'

     uint16_t localPort() const;

              ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:96:14: error: 'uint16_t WiFiClient::localPort(int) const' cannot be overloaded

     uint16_t localPort(int fd) const;

              ^

C:\Users\...\Documents\Arduino\hardware\espressif\esp32\libraries\WiFi\src/WiFiClient.h:91:14: error: with 'uint16_t WiFiClient::localPort(int) const'

     uint16_t localPort(int fd) const;

              ^

priyankachepuri09 · 2017-06-14T10:56:11Z

Same issue as @bestpika unable to compile.

me-no-dev · 2017-06-14T14:52:23Z

fixed in the latest commit ;)

Additions to WiFiClient and WiFiServer

16a8084

Required for WebServer and/or DNSServer libraries

bbx10 mentioned this pull request May 30, 2017

WebServer partly working (not WiFiServer) #395

Closed

me-no-dev reviewed May 30, 2017

View reviewed changes

me-no-dev merged commit b05c7df into espressif:master Jun 14, 2017

Additions to WiFiClient and WiFiServer #404

Additions to WiFiClient and WiFiServer #404

Conversation

bbx10 commented May 30, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bestpika commented Jun 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

priyankachepuri09 commented Jun 14, 2017

Uh oh!

me-no-dev commented Jun 14, 2017

Uh oh!

bestpika commented Jun 14, 2017 •

edited

Loading