Changeset 9713 in ntrip for trunk

Timestamp:

May 7, 2022, 11:57:34 PM (2 years ago)

Author:

stuerze

Message:

minor changes

File:

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

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -60 +60 @@
   if (_ntripVersion != "1") {
     bncSettings settings;
+
+    _sslIgnoreErrors = (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
+
     _proxyHost = settings.value("proxyHost").toString();
     _proxyPort = settings.value("proxyPort").toInt();
-    _sslIgnoreErrors = (Qt::CheckState(settings.value("sslIgnoreErrors").toInt()) == Qt::Checked);
     if (_secure) {
       _casterOutPort = 443;
-      _postExtension = QString("https://%1:%2").arg(_casterOutHost).arg(_casterOutPort);
+      if (!_proxyHost.isEmpty()) {
+        _postExtension = QString("https://%1:%2").arg(_casterOutHost).arg(_casterOutPort);
+      }
     }
     else {
-      _postExtension = QString("http://%1:%2").arg(_casterOutHost).arg(_casterOutPort);
+      if (!_proxyHost.isEmpty()) {
+        _postExtension = QString("http://%1:%2").arg(_casterOutHost).arg(_casterOutPort);
+      }
     }
   }
@@ -203 +209 @@
     }
     else {
-      cout << "open(): outSocketState: " << _outSocket->state() << endl;
       emit(newMessage("Broadcaster: No connection for " + _mountpoint.toLatin1(), true));
     }
@@ -236 +241 @@
   }
 
+  const int timeOut = 5000;  // 5 seconds
   if (!_secure) {
     _outSocket->connectToHost(_outHost, _outPort);
-  }
-  else {
-    _outSocket->connectToHostEncrypted(_outHost, _outPort);
-    if (!_outSocket->waitForEncrypted()) {
-        cout << "waitForEncrypted: " << _outSocket->errorString().toStdString().c_str() << endl;;
-        return;
-    }
-  }
-
-  const int timeOut = 5000;  // 5 seconds
-  if (!_outSocket->waitForConnected(timeOut)) {
-    emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1()
-         + " (" + _outHost.toLatin1()+ ":" + QString("%1) ").arg(_outPort).toLatin1()
-         + _outSocket->errorString().toLatin1(), true));
-    delete _outSocket;
-    _outSocket = 0;
-    return;
-  }
+    if (!_outSocket->waitForConnected(timeOut)) {
+      emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1()
+           + " (" + _outHost.toLatin1()+ ":" + QString("%1) ").arg(_outPort).toLatin1()
+           + _outSocket->errorString().toLatin1(), true));
+      delete _outSocket;
+      _outSocket = 0;
+      return;
+    }
+  }
+  else {
+   _outSocket->connectToHostEncrypted(_outHost, _outPort);
+   if (!_outSocket->waitForEncrypted(timeOut)) {
+     emit(newMessage("Broadcaster: Connect timeout for " + _mountpoint.toLatin1()
+          + " (" + _outHost.toLatin1()+ ":" + QString("%1) ").arg(_outPort).toLatin1()
+          + _outSocket->errorString().toLatin1(), true));
+     delete _outSocket;
+     _outSocket = 0;
+     return;
+   }
+ }
 
   QByteArray msg;