ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Initialise the M17 LSF correctly when not initialised. 

Use a private LSF for testing the encryption.
This commit is contained in:
Jonathan Naylor 2023-12-06 15:36:50 +00:00
parent 333757829f
commit b18aeb5f9d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
M17Control.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020,2021 Jonathan Naylor, G4KLX * Copyright (C) 2020,2021,2023 Jonathan Naylor, G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -553,7 +553,10 @@ void CM17Control::writeNetwork()
m_networkWatchdog.start(); m_networkWatchdog.start();
if (!m_allowEncryption) { if (!m_allowEncryption) {
unsigned char type = m_netLSF.getEncryptionType(); CM17LSF lsf;
lsf.setNetwork(netData);
unsigned char type = lsf.getEncryptionType();
if (type != M17_ENCRYPTION_TYPE_NONE) { if (type != M17_ENCRYPTION_TYPE_NONE) {
LogMessage("M17 encryption rejection"); LogMessage("M17 encryption rejection");
m_network->reset(); m_network->reset();

4
M17LSF.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020,2021 by Jonathan Naylor G4KLX * Copyright (C) 2020,2021,2023 by Jonathan Naylor G4KLX
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -38,6 +38,8 @@ m_lsf(NULL),
m_valid(false) m_valid(false)
{ {
m_lsf = new unsigned char[M17_LSF_LENGTH_BYTES]; m_lsf = new unsigned char[M17_LSF_LENGTH_BYTES];
::memset(m_lsf, 0x00U, M17_LSF_LENGTH_BYTES);
} }
CM17LSF::~CM17LSF() CM17LSF::~CM17LSF()