Merge branch 'master' into IPv6

This commit is contained in:
Jonathan Naylor 2020-10-08 11:35:07 +01:00
commit ab08eace4b

View File

@ -423,8 +423,10 @@ void CNXDNGateway::run()
if (reflector == NULL && currentId != 9999U) {
LogMessage("Unlinked from reflector %u by remote command", currentId);
if (voice != NULL)
if (voice != NULL) {
voice->unlinked();
voice->eof();
}
remoteNetwork.writeUnlink(currentAddr, currentAddrLen, currentId);
remoteNetwork.writeUnlink(currentAddr, currentAddrLen, currentId);
@ -442,8 +444,10 @@ void CNXDNGateway::run()
LogMessage("Linked to reflector %u by remote command", currentId);
if (voice != NULL)
if (voice != NULL) {
voice->linkedTo(currentId);
voice->eof();
}
remoteNetwork.writePoll(currentAddr, currentAddrLen, currentId);
remoteNetwork.writePoll(currentAddr, currentAddrLen, currentId);
@ -465,8 +469,10 @@ void CNXDNGateway::run()
LogMessage("Linked to reflector %u by remote command", currentId);
if (voice != NULL)
if (voice != NULL) {
voice->linkedTo(currentId);
voice->eof();
}
remoteNetwork.writePoll(currentAddr, currentAddrLen, currentId);
remoteNetwork.writePoll(currentAddr, currentAddrLen, currentId);