diff --git a/DMRGateway.cpp b/DMRGateway.cpp index f9a4047..e0ac371 100644 --- a/DMRGateway.cpp +++ b/DMRGateway.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021 by Jonathan Naylor G4KLX * * 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 @@ -1300,32 +1300,32 @@ int CDMRGateway::run() } if (m_dmrNetwork1 != NULL) { - m_dmrNetwork1->close(); + m_dmrNetwork1->close(true); delete m_dmrNetwork1; } if (m_dmrNetwork2 != NULL) { - m_dmrNetwork2->close(); + m_dmrNetwork2->close(true); delete m_dmrNetwork2; } if (m_dmrNetwork3 != NULL) { - m_dmrNetwork3->close(); + m_dmrNetwork3->close(true); delete m_dmrNetwork3; } if (m_dmrNetwork4 != NULL) { - m_dmrNetwork4->close(); + m_dmrNetwork4->close(true); delete m_dmrNetwork4; } if (m_dmrNetwork5 != NULL) { - m_dmrNetwork5->close(); + m_dmrNetwork5->close(true); delete m_dmrNetwork5; } if (m_xlxNetwork != NULL) { - m_xlxNetwork->close(); + m_xlxNetwork->close(true); delete m_xlxNetwork; } @@ -2308,7 +2308,7 @@ bool CDMRGateway::linkXLX(unsigned int number) if (m_xlxNetwork != NULL) { LogMessage("XLX, Disconnecting from XLX%03u", m_xlxNumber); - m_xlxNetwork->close(); + m_xlxNetwork->close(true); delete m_xlxNetwork; } @@ -2345,7 +2345,7 @@ bool CDMRGateway::linkXLX(unsigned int number) void CDMRGateway::unlinkXLX() { if (m_xlxNetwork != NULL) { - m_xlxNetwork->close(); + m_xlxNetwork->close(true); delete m_xlxNetwork; m_xlxNetwork = NULL; } diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 872c2fc..144b134 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX * * 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 @@ -370,7 +370,7 @@ void CDMRNetwork::clock(unsigned int ms) the Network sometimes times out and reaches here. We want it to reconnect so... */ LogError("%s, Login to the master has failed, retrying network ...", m_name.c_str()); - close(); + close(false); open(); return; } diff --git a/DMRNetwork.h b/DMRNetwork.h index 091f3e4..08ed438 100644 --- a/DMRNetwork.h +++ b/DMRNetwork.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017,2018,2020.2021 by Jonathan Naylor G4KLX * * 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 @@ -57,7 +57,7 @@ public: bool isConnected() const; - void close(bool sayGoodbye = true); + void close(bool sayGoodbye); private: sockaddr_storage m_addr; diff --git a/Version.h b/Version.h index b85724b..1a43e3a 100644 --- a/Version.h +++ b/Version.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015-2020 by Jonathan Naylor G4KLX + * Copyright (C) 2015-2021 by Jonathan Naylor G4KLX * * 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 @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20201031"; +const char* VERSION = "20210409"; #endif