mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-27 18:02:17 +03:00
Updater.cpp:
- use new AutoInterruptLock - add delay to give the RTOS some time to handle TCP WiFiClient.cpp - add stopAllexcepted to cancel all TCP excepted one ClientContext.h - add getLocalPort() ESP8266HTTPUpdate.cpp - close all not needed TCP and UDP osapi.h - missing commit from SDK
This commit is contained in:
@ -284,3 +284,27 @@ void WiFiClient::stopAll()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void WiFiClient::stopAllexcepted(WiFiClient * exC) {
|
||||
for (WiFiClient* it = _s_first; it; it = it->_next) {
|
||||
ClientContext* c = it->_client;
|
||||
|
||||
if(c && exC->_client) {
|
||||
if(exC->_client->getRemoteAddress() == c->getRemoteAddress()) {
|
||||
if(exC->_client->getRemotePort() == c->getRemotePort()) {
|
||||
if(exC->_client->getLocalPort() == c->getLocalPort()) {
|
||||
// ignore this
|
||||
c = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (c) {
|
||||
c->abort();
|
||||
c->unref();
|
||||
it->_client = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -91,6 +91,7 @@ public:
|
||||
using Print::write;
|
||||
|
||||
static void stopAll();
|
||||
static void stopAllexcepted(WiFiClient * c);
|
||||
|
||||
private:
|
||||
|
||||
|
@ -125,6 +125,12 @@ class ClientContext {
|
||||
return _pcb->remote_port;
|
||||
}
|
||||
|
||||
uint16_t getLocalPort() {
|
||||
if(!_pcb) return 0;
|
||||
|
||||
return _pcb->local_port;
|
||||
}
|
||||
|
||||
size_t getSize() const {
|
||||
if(!_rx_buf) return 0;
|
||||
|
||||
|
@ -128,10 +128,17 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * host, uint16_t port,
|
||||
ret = HTTP_UPDATE_FAILD;
|
||||
DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
|
||||
} else {
|
||||
if(ESP.updateSketch(tcp, len)) {
|
||||
// may never reached!
|
||||
|
||||
WiFiUDP::stopAll();
|
||||
WiFiClient::stopAllexcepted(&tcp);
|
||||
|
||||
delay(100);
|
||||
|
||||
if(ESP.updateSketch(tcp, len, false, false)) {
|
||||
ret = HTTP_UPDATE_OK;
|
||||
DEBUG_HTTP_UPDATE("[httpUpdate] Update ok\n");
|
||||
tcp.stop();
|
||||
ESP.restart();
|
||||
} else {
|
||||
ret = HTTP_UPDATE_FAILD;
|
||||
DEBUG_HTTP_UPDATE("[httpUpdate] Update failed\n");
|
||||
|
@ -28,6 +28,8 @@
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <ESP8266WiFi.h>
|
||||
#include <WiFiUdp.h>
|
||||
#include <WiFiClient.h>
|
||||
|
||||
//#define DEBUG_HTTP_UPDATE(...) Serial1.printf( __VA_ARGS__ )
|
||||
|
||||
|
Reference in New Issue
Block a user