Changeset 9851 in ntrip


Ignore:
Timestamp:
Oct 17, 2022, 10:01:11 PM (7 weeks ago)
Author:
stuerze
Message:

minor changes

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncgetthread.cpp

    r9688 r9851  
    474474
    475475        if (data.isEmpty() || BNC_CORE->sigintReceived) {
    476           cout << "no more data or Ctrl-C received" << endl;
     476          emit(newMessage("No more data or Ctrl-C received", true));
    477477          BNC_CORE->stopCombination();
    478478          BNC_CORE->stopPPP();
  • trunk/BNC/src/upload/bncuploadcaster.cpp

    r9850 r9851  
    266266      if (ans.indexOf("200") == -1) {
    267267        int l = ans.indexOf("\r\n", 0);
    268         emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + ": "  + ans.left(l), true));
     268        emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + "@" +
     269            _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1()  + ": "  + ans.left(l), true));
    269270        delete _outSocket; _outSocket = 0;
    270271        return;
     
    275276        _outSocket->startClientEncryption();
    276277        if (!_outSocket->waitForEncrypted(timeOut)) {
    277           emit(newMessage("Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + " ("
     278          emit(newMessage("Proxy/Caster: Encrypt timeout for " + _mountpoint.toLatin1() + "@"
    278279                          + _casterOutHost.toLatin1() + ":"
    279280                          + QString("%1) ").arg(_casterOutPort).toLatin1()
     
    282283          return;
    283284        } else {
    284           emit(newMessage("Proxy: SSL handshake completed for " + _mountpoint.toLatin1(), true));
     285          emit(newMessage("Proxy: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
     286              _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
    285287        }
    286288      }
     
    308310    delete _outSocket; _outSocket = 0;
    309311    int l = ans.indexOf("\r\n", 0);
    310     emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
    311                     ": Connection broken for " + _mountpoint.toLatin1() + ": " + ans.left(l), true));
    312   } else {
    313     emit(newMessage("Broadcaster" +   _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
    314                     ": Connection opened for " + _mountpoint.toLatin1(), true));
     312    emit(newMessage("Broadcaster:  Connection broken for " + _mountpoint.toLatin1() + "@" +
     313         _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
     314         ": " + ans.left(l), true));
     315  } else {
     316    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1() + "@" +
     317        _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() , true));
    315318    _sOpenTrial = 0;
    316319  }
     
    325328    if (!_outSocket->waitForEncrypted(timeOut)) {
    326329      emit(newMessage(
    327            "Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
    328            ": Connect timeout for " + _mountpoint.toLatin1() + " ("
     330           "Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
    329331              + outHost.toLatin1() + ":"
    330332              + QString("%1) ").arg(outPort).toLatin1()
     
    333335      return false;
    334336    } else {
    335       emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
    336                       ": SSL handshake completed for " + _mountpoint.toLatin1(), true));
     337      emit(newMessage("Broadcaster: SSL handshake completed for " + _mountpoint.toLatin1() + "@" +
     338          _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1(), true));
    337339    }
    338340  } else {
    339341    _outSocket->connectToHost(outHost, outPort);
    340342    if (!_outSocket->waitForConnected(timeOut)) {
    341       emit(newMessage("Broadcaster " + _casterOutHost.toLatin1() + ":" + QString("%1").arg(_casterOutPort).toLatin1() +
    342                       ": Connect timeout for " + _mountpoint.toLatin1() + " ("
     343      emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1() + "@"
    343344              + outHost.toLatin1() + ":"
    344345              + QString("%1) ").arg(outPort).toLatin1()
Note: See TracChangeset for help on using the changeset viewer.