adafruit-mirror/arduino-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

WiFiUDP only emit a packet on flush if not ended (#2618)

Browse source 
A flush() on a packet that's already been sent should be a no-op, not
send a 0-byte UDP packet.  Track when an outgoing packet is dirty and
only endPacket()/transmit it when so.

Fixes #2617
This commit is contained in:
Earle F. Philhower, III 2024-11-17 08:58:44 -08:00 committed by GitHub
parent ca30518510
commit bda12cd7e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/WiFi/src/WiFiUdp.cpp
View file

@ -38,7 +38,7 @@ template<>
WiFiUDP* SList<WiFiUDP>::_s_first = 0;
/* Constructor */
WiFiUDP::WiFiUDP() : _ctx(0), _multicast(false) {
WiFiUDP::WiFiUDP() : _ctx(0), _multicast(false), _dirty(false) {
WiFiUDP::_add(this);
}
@ -49,6 +49,7 @@ WiFiUDP::WiFiUDP(const WiFiUDP& other) {
}
WiFiUDP::_add(this);
_multicast = other._multicast;
_dirty = other._dirty;
}
WiFiUDP& WiFiUDP::operator=(const WiFiUDP& rhs) {
@ -149,6 +150,7 @@ int WiFiUDP::beginPacket(IPAddress ip, uint16_t port) {
_ctx->setMulticastInterface(IP_ADDR_ANY);
_ctx->setMulticastTTL(255);
}
_dirty = false;
return ret;
}
@ -164,6 +166,7 @@ int WiFiUDP::beginPacketMulticast(IPAddress multicastAddress, uint16_t port,
}
_ctx->setMulticastInterface(interfaceAddress);
_ctx->setMulticastTTL(ttl);
_dirty = false;
return 1;
}
@ -171,6 +174,7 @@ int WiFiUDP::endPacket() {
if (!_ctx) {
return 0;
}
_dirty = false;
return (_ctx->send()) ? 1 : 0;
}
@ -183,7 +187,7 @@ size_t WiFiUDP::write(const uint8_t *buffer, size_t size) {
if (!_ctx) {
return 0;
}
_dirty = true;
return _ctx->append(reinterpret_cast<const char*>(buffer), size);
}
@ -224,7 +228,9 @@ int WiFiUDP::peek() {
}
void WiFiUDP::flush() {
endPacket();
if (_dirty) {
endPacket();
}
}
IPAddress WiFiUDP::remoteIP() {

1
libraries/WiFi/src/WiFiUdp.h
View file

@ -115,4 +115,5 @@ public:
private:
bool _multicast;
bool _dirty;
};