Merge branch 'master' into master

Author: d-a-v

cores/esp8266/FS.h

@@ -90,9 +90,8 @@ class File : public Stream
  uint8_t obuf[256];
  size_t doneLen = 0;
  size_t sentLen;
- int i;
 
- while (src.available() > sizeof(obuf)){
+ while (src.available() > (int)sizeof(obuf)){
  src.read(obuf, sizeof(obuf));
  sentLen = write(obuf, sizeof(obuf));
  doneLen = doneLen + sentLen;

cores/esp8266/LwipDhcpServer.cpp

@@ -414,7 +414,7 @@ DhcpServer::OptionsBuffer DhcpServer::create_msg(struct dhcps_msg* m)
 ///////////////////////////////////////////////////////////////////////////////////
 void DhcpServer::send_offer(struct dhcps_msg* m)
 {
- struct pbuf *p, *q;
+ struct pbuf* p;
 
  auto options = create_msg(m);
  options.add(DHCP_OPTION_MSG_TYPE, DHCPOFFER);
@@ -438,12 +438,7 @@ void DhcpServer::send_offer(struct dhcps_msg* m)
  os_printf("dhcps: send_offer>>p->tot_len = %d\n", p->tot_len);
  os_printf("dhcps: send_offer>>p->len = %d\n", p->len);
 #endif
- q = p;
- while (q != nullptr)
- {
- std::memcpy((u8_t*)q->payload, reinterpret_cast<u8_t*>(&m), q->len);
- q = q->next;
- }
+ pbuf_take(p, m, sizeof(struct dhcps_msg));
  }
  else
  {
@@ -475,7 +470,7 @@ void DhcpServer::send_offer(struct dhcps_msg* m)
 ///////////////////////////////////////////////////////////////////////////////////
 void DhcpServer::send_nak(struct dhcps_msg* m)
 {
- struct pbuf *p, *q;
+ struct pbuf* p;
 
  auto options = create_msg(m);
  options.add(DHCP_OPTION_MSG_TYPE, DHCPNAK);
@@ -492,12 +487,7 @@ void DhcpServer::send_nak(struct dhcps_msg* m)
  os_printf("dhcps: send_nak>>p->tot_len = %d\n", p->tot_len);
  os_printf("dhcps: send_nak>>p->len = %d\n", p->len);
 #endif
- q = p;
- while (q != nullptr)
- {
- std::memcpy((u8_t*)q->payload, (u8_t*)m, q->len);
- q = q->next;
- }
+ pbuf_take(p, m, sizeof(struct dhcps_msg));
  }
  else
  {
@@ -524,7 +514,7 @@ void DhcpServer::send_nak(struct dhcps_msg* m)
 ///////////////////////////////////////////////////////////////////////////////////
 void DhcpServer::send_ack(struct dhcps_msg* m)
 {
- struct pbuf *p, *q;
+ struct pbuf* p;
 
  auto options = create_msg(m);
  options.add(DHCP_OPTION_MSG_TYPE, DHCPACK);
@@ -548,12 +538,7 @@ void DhcpServer::send_ack(struct dhcps_msg* m)
  os_printf("dhcps: send_ack>>p->tot_len = %d\n", p->tot_len);
  os_printf("dhcps: send_ack>>p->len = %d\n", p->len);
 #endif
- q = p;
- while (q != nullptr)
- {
- std::memcpy((u8_t*)q->payload, (u8_t*)m, q->len);
- q = q->next;
- }
+ pbuf_take(p, m, sizeof(struct dhcps_msg));
  }
  else
  {

doc/filesystem.rst

@@ -93,7 +93,7 @@ directory support, but has higher filesystem and per-file overhead
 (4K minimum vs. SPIFFS' 256 byte minimum file allocation unit).
 
 They share a compatible API but have incompatible on-flash
-implementations, so it is important to choose one or the per project
+implementations, so it is important to choose one or the other per project
 as attempting to mount a SPIFFS volume under LittleFS may result
 in a format operation and definitely will not preserve any files,
 and vice-versa.

libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp

@@ -167,8 +167,7 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* psk, int channel,
  DEBUG_WIFI("[AP] softap config unchanged\n");
  }
 
- auto& server = softAPDhcpServer();
- server.end();
+ wifi_softap_dhcps_stop();
 
  // check IP config
  struct ip_info ip;
@@ -179,17 +178,13 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* psk, int channel,
  IPAddress(192, 168, 4, 1),
  IPAddress(192, 168, 4, 1),
  IPAddress(255, 255, 255, 0));
- if(!ret) {
- DEBUG_WIFI("[AP] softAPConfig failed!\n");
- ret = false;
- }
  }
  } else {
  DEBUG_WIFI("[AP] wifi_get_ip_info failed!\n");
  ret = false;
  }
 
- server.begin();
+ wifi_softap_dhcps_start();
 
  return ret;
 }
@@ -227,9 +222,10 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
  info.gw.addr = gateway.v4();
  info.netmask.addr = subnet.v4();
 
- auto& server = softAPDhcpServer();
- server.end();
-
+ // use SDK function for dhcps, not just server.begin()
+ // setting info with static IPs will fail otherwise
+ // (TODO: dhcps_flag seems to store 'SDK' DHCPs status)
+ wifi_softap_dhcps_stop();
  if(!wifi_set_ip_info(SOFTAP_IF, &info)) {
  DEBUG_WIFI("[APConfig] wifi_set_ip_info failed!\n");
  ret = false;
@@ -246,14 +242,17 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
  dhcp_lease.end_ip.addr = ip.v4();
  DEBUG_WIFI("[APConfig] DHCP IP end: %s\n", ip.toString().c_str());
 
+ auto& server = softAPDhcpServer();
  if(!server.set_dhcps_lease(&dhcp_lease))
  {
- DEBUG_WIFI("[APConfig] wifi_set_ip_info failed!\n");
+ DEBUG_WIFI("[APConfig] server set_dhcps_lease failed!\n");
  ret = false;
  }
 
- server.setRouter(true); // send ROUTER option with netif's gateway IP
- server.begin();
+ // send ROUTER option with netif's gateway IP
+ server.setRouter(true);
+
+ wifi_softap_dhcps_start();
 
  // check config
  if(wifi_get_ip_info(SOFTAP_IF, &info)) {
@@ -277,7 +276,7 @@ bool ESP8266WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPA
 /**
  * Disconnect from the network (close AP)
  * @param wifioff disable mode?
- * @return one value of wl_status_t enum
+ * @return operation success
  */
 bool ESP8266WiFiAPClass::softAPdisconnect(bool wifioff) {
  bool ret;

libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp

@@ -222,8 +222,14 @@ void ESP8266WiFiGenericClass::_eventCallback(void* arg)
  System_Event_t* event = reinterpret_cast<System_Event_t*>(arg);
  DEBUG_WIFI("wifi evt: %d\n", event->event);
 
- if(event->event == EVENT_STAMODE_DISCONNECTED) {
+ if (event->event == EVENT_STAMODE_DISCONNECTED) {
  DEBUG_WIFI("STA disconnect: %d\n", event->event_info.disconnected.reason);
+ // workaround for https://github.com/esp8266/Arduino/issues/7432
+ // still delivers the event, just handle this specific case
+ if ((wifi_station_get_connect_status() == STATION_GOT_IP) && !wifi_station_get_reconnect_policy()) {
+ DEBUG_WIFI("forcibly stopping the station connection manager\n");
+ wifi_station_disconnect();
+ }
  }
 
  if (event->event == EVENT_STAMODE_AUTHMODE_CHANGE) {