Changeset 9712 in ntrip for trunk

Timestamp:

May 6, 2022, 10:28:46 PM (3 years ago)

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/upload/bncuploadcaster.cpp (modified) (4 diffs)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -198 +198 @@
   }
 
-  if (_outSocket != 0 &&
-      _outSocket->state() == QAbstractSocket::ConnectedState) {
-    return;
-  }
-  
+  if (_outSocket != 0) {
+    if (_outSocket->state() == QAbstractSocket::ConnectedState) {
+      return;
+    }
+    else {
+      cout << "open(): outSocketState: " << _outSocket->state() << endl;
+      emit(newMessage("Broadcaster: No connection for " + _mountpoint.toLatin1(), true));
+    }
+  }
+
   delete _outSocket; _outSocket = 0;
 
@@ -222 +227 @@
   }
   _outSocket->setProxy(QNetworkProxy::NoProxy); // to prevent the usage of system entries
-  if (_ntripVersion == "1") {
-    _outHost = _casterOutHost;
-    _outPort = _casterOutPort;
-  }
-  else {
-    if (!_proxyHost.isEmpty()) {
-      _outHost = _proxyHost;
-      _outPort = _proxyPort;
-      connect(_outSocket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-              this, SLOT(slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
-    }
+  _outHost = _casterOutHost;
+  _outPort = _casterOutPort;
+  if (!_proxyHost.isEmpty()) {
+    _outHost = _proxyHost;
+    _outPort = _proxyPort;
+    connect(_outSocket, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+            this, SLOT(slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
   }
 
@@ -239 +240 @@
   }
   else {
-    _outSocket->connectToHostEncrypted(_outHost, _outPort);/*
+    _outSocket->connectToHostEncrypted(_outHost, _outPort);
     if (!_outSocket->waitForEncrypted()) {
         cout << "waitForEncrypted: " << _outSocket->errorString().toStdString().c_str() << endl;;
         return;
-    }*/
+    }
   }
 
@@ -283 +284 @@
   }
   else {
-    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1(), true));
+    emit(newMessage("Broadcaster: Connection opened for " + _mountpoint.toLatin1() + ": " + ans.left(ans.length()-2), true));
     _sOpenTrial = 0;
   }