diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp index bb6a4edb..0051993e 100644 --- a/examples/simple_repeater/MyMesh.cpp +++ b/examples/simple_repeater/MyMesh.cpp @@ -1110,7 +1110,7 @@ void MyMesh::onControlDataRecv(mesh::Packet* packet) { memcpy(&data[6], self_id.pub_key, PUB_KEY_SIZE); auto resp = createControlData(data, prefix_only ? 6 + 8 : 6 + PUB_KEY_SIZE); if (resp) { - sendZeroHop(resp, getRetransmitDelay(resp)*4); // apply random delay (widened x4), as multiple nodes can respond to this + sendZeroHop(resp, getRetransmitDelay(resp)*4, _prefs.path_hash_mode + 1); // apply random delay (widened x4), as multiple nodes can respond to this } } } else if (type == CTL_TYPE_NODE_DISCOVER_RESP && packet->payload_len >= 6) { @@ -1153,7 +1153,7 @@ void MyMesh::sendNodeDiscoverReq() { auto pkt = createControlData(data, sizeof(data)); if (pkt) { - sendZeroHop(pkt); + sendZeroHop(pkt, (uint32_t)0, _prefs.path_hash_mode + 1); // přetypování nutné: holá 0 je i null pointer pro transport_codes přetížení } } @@ -1384,7 +1384,7 @@ void MyMesh::sendSelfAdvertisement(int delay_millis, bool flood) { if (flood) { sendFloodScoped(default_scope, pkt, delay_millis, _prefs.path_hash_mode + 1); } else { - sendZeroHop(pkt, delay_millis); + sendZeroHop(pkt, delay_millis, _prefs.path_hash_mode + 1); } } else { MESH_DEBUG_PRINTLN("ERROR: unable to create advertisement packet!"); @@ -1699,8 +1699,11 @@ void MyMesh::loop() { updateFloodAdvertTimer(); // schedule next flood advert updateAdvertTimer(); // also schedule local advert (so they don't overlap) } else if (next_local_advert && millisHasNowPassed(next_local_advert)) { + // Šířku předat i tady: tenhle periodický advert NEJDE přes + // sendSelfAdvertisement(), takže by ji jinak minul — a je to přesně on, kdo + // se každé `advert.interval` minuty hlásil na jeden bajt. mesh::Packet *pkt = createSelfAdvert(); - if (pkt) sendZeroHop(pkt); + if (pkt) sendZeroHop(pkt, (uint32_t)0, _prefs.path_hash_mode + 1); // (uint32_t) viz výš updateAdvertTimer(); // schedule next local advert } diff --git a/src/Mesh.cpp b/src/Mesh.cpp index e9ff4b36..1d646b3a 100644 --- a/src/Mesh.cpp +++ b/src/Mesh.cpp @@ -725,24 +725,28 @@ void Mesh::sendDirect(Packet* packet, const uint8_t* path, uint8_t path_len, uin sendPacket(packet, pri, delay_millis); } -void Mesh::sendZeroHop(Packet* packet, uint32_t delay_millis) { +void Mesh::sendZeroHop(Packet* packet, uint32_t delay_millis, uint8_t path_hash_size) { packet->header &= ~PH_ROUTE_MASK; packet->header |= ROUTE_TYPE_DIRECT; - packet->path_len = 0; // path_len of zero means Zero Hop + // Zero Hop = nulový počet hopů. POZOR, dřív tu bylo `packet->path_len = 0`, + // což vynulovalo CELÝ bajt — a v jeho horních dvou bitech bydlí šířka hashe + // (Packet.h:85). Každý zerohop paket proto hlásil 1 B bez ohledu na + // nastavení uzlu a v analyzerech kreslil dvoubajtový uzel jako jednobajtový. + packet->setPathHashSizeAndCount(path_hash_size, 0); _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us sendPacket(packet, 0, delay_millis); } -void Mesh::sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis) { +void Mesh::sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis, uint8_t path_hash_size) { packet->header &= ~PH_ROUTE_MASK; packet->header |= ROUTE_TYPE_TRANSPORT_DIRECT; packet->transport_codes[0] = transport_codes[0]; packet->transport_codes[1] = transport_codes[1]; - packet->path_len = 0; // path_len of zero means Zero Hop + packet->setPathHashSizeAndCount(path_hash_size, 0); // viz komentář výš _tables->markSeen(packet); // mark this packet as already sent in case it is rebroadcast back to us diff --git a/src/Mesh.h b/src/Mesh.h index 49a299a6..2b2e6635 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -215,13 +215,16 @@ public: /** * \brief send a locally-generated Packet to just neighbor nodes (zero hops) */ - void sendZeroHop(Packet* packet, uint32_t delay_millis=0); + // `path_hash_size` tu je ze stejného důvodu jako u sendFlood: zerohop paket + // sice cestu nenese, ale ta šířka je v hlavičce a analyzery z ní odvozují, + // na kolika bajtech uzel jede. Bez toho parametru hlásí každý zerohop 1 B. + void sendZeroHop(Packet* packet, uint32_t delay_millis=0, uint8_t path_hash_size=1); /** * \brief send a locally-generated Packet to just neighbor nodes (zero hops), with specific transport codes * \param transport_codes array of 2 codes to attach to packet */ - void sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0); + void sendZeroHop(Packet* packet, uint16_t* transport_codes, uint32_t delay_millis=0, uint8_t path_hash_size=1); };