pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-09 22:52:07 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix: log error if node_db is full instead of firmware crash (#1191)

Browse Source
This commit is contained in:
Clemens H / OE1RFC / datacop 2022-02-10 18:44:58 +01:00 committed by GitHub
parent 288f2be8ea
commit e3df4fe4b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesh/NodeDB.cpp
View File

@ -474,6 +474,9 @@ size_t NodeDB::getNumOnlineNodes()
void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src) void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
{ {
NodeInfo *info = getOrCreateNode(nodeId); NodeInfo *info = getOrCreateNode(nodeId);
if (!info) {
return;
}
if (src == RX_SRC_LOCAL) { if (src == RX_SRC_LOCAL) {
// Local packet, fully authoritative // Local packet, fully authoritative
@ -517,6 +520,9 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
void NodeDB::updateUser(uint32_t nodeId, const User &p) void NodeDB::updateUser(uint32_t nodeId, const User &p)
{ {
NodeInfo *info = getOrCreateNode(nodeId); NodeInfo *info = getOrCreateNode(nodeId);
if (!info) {
return;
}
DEBUG_MSG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name); DEBUG_MSG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
@ -546,6 +552,9 @@ void NodeDB::updateFrom(const MeshPacket &mp)
DEBUG_MSG("Update DB node 0x%x, rx_time=%u\n", mp.from, mp.rx_time); DEBUG_MSG("Update DB node 0x%x, rx_time=%u\n", mp.from, mp.rx_time);
NodeInfo *info = getOrCreateNode(getFrom(&mp)); NodeInfo *info = getOrCreateNode(getFrom(&mp));
if (!info) {
return;
}
if (mp.rx_time) // if the packet has a valid timestamp use it to update our last_heard if (mp.rx_time) // if the packet has a valid timestamp use it to update our last_heard
info->last_heard = mp.rx_time; info->last_heard = mp.rx_time;
@ -572,8 +581,12 @@ NodeInfo *NodeDB::getOrCreateNode(NodeNum n)
NodeInfo *info = getNode(n); NodeInfo *info = getNode(n);
if (!info) { if (!info) {
if (*numNodes >= MAX_NUM_NODES) {
screen->print("error: node_db full!\n");
DEBUG_MSG("ERROR! could not create new node, node_db is full! (%d nodes)", *numNodes);
return NULL;
}
// add the node // add the node
assert(*numNodes < MAX_NUM_NODES);
info = &nodes[(*numNodes)++]; info = &nodes[(*numNodes)++];
// everything is missing except the nodenum // everything is missing except the nodenum