From ce66f844d1b973ccea2227710d7ef6c8decfddfd Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 11 Apr 2020 19:52:53 +0200 Subject: [PATCH] bug fix: compatiblity to old server versions were incorrect for the server list --- ChangeLog | 3 ++- src/protocol.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7579c77b..f05638a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,6 @@ - TODO split country names by upper case latters by inserting a space TODO fix UpdateCurLevel() for new 64 samples frame size @@ -29,6 +28,8 @@ TODO offer the Jamulus ASIO settingspanel in case of an ASIO ERROR to fix, e.g., TODO client: larger sound card buffers are managed by conversion buffer, not in processintern for loop (note iSndCrdFrameSizeFactor!) +TODO should LHostAddr be QHostAddress instead of CHostAddress? + diff --git a/src/protocol.cpp b/src/protocol.cpp index c64addfa..04b5b65c 100755 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -1507,10 +1507,10 @@ bool CProtocol::EvaluateCLRegisterServerMes ( const CHostAddress& InetAddr, if ( sLocHost.isEmpty() ) { - // old server, empty "topic", register as external address - LInetAddr = InetAddr; + // old server, empty "topic", register as local host + LInetAddr.InetAddr.setAddress ( QHostAddress::LocalHost ); } - else if ( !LInetAddr.InetAddr.setAddress( sLocHost ) ) + else if ( !LInetAddr.InetAddr.setAddress ( sLocHost ) ) { return true; // return error code } @@ -1674,10 +1674,10 @@ bool CProtocol::EvaluateCLServerListMes ( const CHostAddress& InetAddr, CHostAddress LInetAddr; if ( strLHostAddr.isEmpty() ) { - // old central server, empty "topic", default to server address - LInetAddr.InetAddr.setAddress( iIpAddr ); + // old central server, empty "topic", default to localhost + LInetAddr.InetAddr.setAddress ( QHostAddress::LocalHost ); } - else if ( !LInetAddr.InetAddr.setAddress( strLHostAddr ) ) + else if ( !LInetAddr.InetAddr.setAddress ( strLHostAddr ) ) { return true; // return error code }