rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

multichannel code is done! (only basic testing completed though)

Browse Source
This commit is contained in:
Kevin Hester
2021-02-23 10:45:03 +08:00
parent 2761c85564
commit ae6b7e7259
4 changed files with 51 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesh/Channels.cpp
View File

@@ -192,7 +192,7 @@ void Channels::setChannel(const Channel &c)
// if this is the new primary, demote any existing roles
if (c.role == Channel_Role_PRIMARY)
for (int i = 0; i < devicestate.channels_count; i++)
for (int i = 0; i < getNumChannels(); i++)
if (devicestate.channels[i].role == Channel_Role_PRIMARY)
devicestate.channels[i].role = Channel_Role_SECONDARY;
@@ -271,11 +271,18 @@ const char *Channels::getPrimaryName()
*
* This method is called before decoding inbound packets
*
* @return -1 if no suitable channel could be found, otherwise returns the channel index
* @return false if the channel hash or channel is invalid
*/
int16_t Channels::setActiveByHash(ChannelHash channelHash)
bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash)
{
// fixme cant work;
if(chIndex > getNumChannels() || getHash(chIndex) != channelHash) {
DEBUG_MSG("Skipping channel %d due to invalid hash/index\n", chIndex);
return false;
}
else {
setCrypto(chIndex);
return true;
}
}
/** Given a channel index setup crypto for encoding that channel (or the primary channel if that channel is unsecured)