Browse Source

Add null check for packet allocation and clean up Dispatcher

pull/454/head
João Brázio 1 year ago
parent
commit
92ee1820c4
No known key found for this signature in database GPG Key ID: 56A1490716A324DD
  1. 9
      examples/simple_repeater/main.cpp
  2. 3
      src/Dispatcher.cpp

9
examples/simple_repeater/main.cpp

@ -774,9 +774,16 @@ public:
#endif #endif
if (f16 == crc) { if (f16 == crc) {
mesh::Packet *pkt = _mgr->allocNew(); Packet *pkt = _mgr->allocNew();
if (pkt != NULL) {
pkt->readFrom(bytes, len); pkt->readFrom(bytes, len);
_mgr->queueInbound(pkt, millis()); _mgr->queueInbound(pkt, millis());
} else {
#if MESH_PACKET_LOGGING
Serial.printf("BRIDGE: Unable to allocate new Packet *pkt");
#endif
}
} }
} }
} }

3
src/Dispatcher.cpp

@ -104,7 +104,6 @@ void Dispatcher::loop() {
processRecvPacket(pkt); processRecvPacket(pkt);
} }
} }
checkRecv(); checkRecv();
checkSend(); checkSend();
} }
@ -116,7 +115,6 @@ void Dispatcher::checkRecv() {
{ {
uint8_t raw[MAX_TRANS_UNIT+1]; uint8_t raw[MAX_TRANS_UNIT+1];
int len = _radio->recvRaw(raw, MAX_TRANS_UNIT); int len = _radio->recvRaw(raw, MAX_TRANS_UNIT);
if (len > 0) { if (len > 0) {
logRxRaw(_radio->getLastSNR(), _radio->getLastRSSI(), raw, len); logRxRaw(_radio->getLastSNR(), _radio->getLastRSSI(), raw, len);
@ -330,4 +328,5 @@ bool Dispatcher::millisHasNowPassed(unsigned long timestamp) const {
unsigned long Dispatcher::futureMillis(int millis_from_now) const { unsigned long Dispatcher::futureMillis(int millis_from_now) const {
return _ms->getMillis() + millis_from_now; return _ms->getMillis() + millis_from_now;
} }
} }
Loading…
Cancel
Save