Skip to content

WIP: Run multiple mesh nodes on a single device #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
+667 −1,325
Draft

WIP: Run multiple mesh nodes on a single device #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
381 changes: 215 additions & 166 deletions examples/simple_room_server/main.cpp
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 13 additions & 7 deletions src/Dispatcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,13 @@ void Dispatcher::checkRecv() {
if (pkt == NULL) {
MESH_DEBUG_PRINTLN("%s Dispatcher::checkRecv(): WARNING: received data, no unused packets available!", getLogDateTime());
} else {
_mgr->take(pkt);
int i = 0;
#ifdef NODE_ID
uint8_t sender_id = raw[i++];
if (sender_id == NODE_ID - 1 || sender_id == NODE_ID + 1) { // simulate that NODE_ID can only hear NODE_ID-1 or NODE_ID+1, eg. 3 can't hear 1
} else {
_mgr->free(pkt); // put back into pool
_mgr->release(pkt); // put back into pool
return;
}
#endif
Expand All @@ -111,15 +112,15 @@ void Dispatcher::checkRecv() {

if (pkt->path_len > MAX_PATH_SIZE || i + pkt->path_len > len) {
MESH_DEBUG_PRINTLN("%s Dispatcher::checkRecv(): partial or corrupt packet received, len=%d", getLogDateTime(), len);
_mgr->free(pkt); // put back into pool
_mgr->release(pkt); // put back into pool
pkt = NULL;
} else {
memcpy(pkt->path, &raw[i], pkt->path_len); i += pkt->path_len;

pkt->payload_len = len - i; // payload is remainder
if (pkt->payload_len > sizeof(pkt->payload)) {
MESH_DEBUG_PRINTLN("%s Dispatcher::checkRecv(): packet payload too big, payload_len=%d", getLogDateTime(), (uint32_t)pkt->payload_len);
_mgr->free(pkt); // put back into pool
_mgr->release(pkt); // put back into pool
pkt = NULL;
} else {
memcpy(pkt->payload, &raw[i], pkt->payload_len);
Expand Down Expand Up @@ -179,7 +180,7 @@ void Dispatcher::checkRecv() {
void Dispatcher::processRecvPacket(Packet* pkt) {
DispatcherAction action = onRecvPacket(pkt);
if (action == ACTION_RELEASE) {
_mgr->free(pkt);
_mgr->release(pkt);
} else if (action == ACTION_MANUAL_HOLD) {
// sub-class is wanting to manually hold Packet instance, and call releasePacket() at appropriate time
} else { // ACTION_RETRANSMIT*
Expand Down Expand Up @@ -227,7 +228,7 @@ void Dispatcher::checkSend() {

if (len + outbound->payload_len > MAX_TRANS_UNIT) {
MESH_DEBUG_PRINTLN("%s Dispatcher::checkSend(): FATAL: Invalid packet queued... too long, len=%d", getLogDateTime(), len + outbound->payload_len);
_mgr->free(outbound);
_mgr->release(outbound);
outbound = NULL;
} else {
memcpy(&raw[len], outbound->payload, outbound->payload_len); len += outbound->payload_len;
Expand Down Expand Up @@ -257,20 +258,25 @@ Packet* Dispatcher::obtainNewPacket() {
if (pkt == NULL) {
n_full_events++;
} else {
takePacket(pkt);
pkt->payload_len = pkt->path_len = 0;
pkt->_snr = 0;
}
return pkt;
}

void Dispatcher::takePacket(Packet* packet) {
_mgr->take(packet);
}

void Dispatcher::releasePacket(Packet* packet) {
_mgr->free(packet);
_mgr->release(packet);
}

void Dispatcher::sendPacket(Packet* packet, uint8_t priority, uint32_t delay_millis) {
if (packet->path_len > MAX_PATH_SIZE || packet->payload_len > MAX_PACKET_PAYLOAD) {
MESH_DEBUG_PRINTLN("%s Dispatcher::sendPacket(): ERROR: invalid packet... path_len=%d, payload_len=%d", getLogDateTime(), (uint32_t) packet->path_len, (uint32_t) packet->payload_len);
_mgr->free(packet);
_mgr->release(packet);
} else {
_mgr->queueOutbound(packet, priority, futureMillis(delay_millis));
}
Expand Down
8 changes: 7 additions & 1 deletion src/Dispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class Radio {
class PacketManager {
public:
virtual Packet* allocNew() = 0;
virtual void free(Packet* packet) = 0;
virtual void take(Packet* packet) = 0;
virtual void release(Packet* packet) = 0;

virtual void queueOutbound(Packet* packet, uint8_t priority, uint32_t scheduled_for) = 0;
virtual Packet* getNextOutbound(uint32_t now) = 0; // by priority
Expand Down Expand Up @@ -132,10 +133,15 @@ class Dispatcher {
virtual uint32_t getCADFailMaxDuration() const;

public:
Radio* getRadio() { return _radio; }
PacketManager* getManager() { return _mgr; }
MillisecondClock* getClock() { return _ms; }

void begin();
void loop();

Packet* obtainNewPacket();
void takePacket(Packet* packet);
void releasePacket(Packet* packet);
void sendPacket(Packet* packet, uint8_t priority, uint32_t delay_millis=0);

Expand Down
Loading