Changeset 9717 in ntrip for trunk

Timestamp:

May 17, 2022, 1:46:35 PM (3 years ago)

Author:

stuerze

Message:

 

File:

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

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -147 +147 @@
   }
 
-  BNC_CORE->slotMessage(msg.toLatin1(), true);
+  emit(newMessage(msg.toLatin1(), true));
 
   if (_sslIgnoreErrors) {
-    _outSocket->ignoreSslErrors();
+    if (_outSocket) {
+      _outSocket->ignoreSslErrors();
+    }
   } else {
     deleteSafely();
@@ -200 +202 @@
 void bncUploadCaster::open() {
   const int timeOut = 5000;  // 5 seconds
+  bncSslConfig sslConfig;
   QByteArray msg;
-  bncSslConfig sslConfig;
+
 
   if (_mountpoint.isEmpty()) {
@@ -230 +233 @@
 
   _outSocket = new QSslSocket();
+
   _outSocket->setSslConfiguration(sslConfig);
-  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
   _outSocket->setProxy(QNetworkProxy::NoProxy);
 
@@ -293 +296 @@
   }
 
+  connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+
   if (_ntripVersion == "1") {
     msg = "SOURCE " + _password.toLatin1() + " /" + _mountpoint.toLatin1()
@@ -340 +345 @@
       _outSocket = 0;
       return false;
+    } else {
+      emit(newMessage("Broadcaster: SSL handshake completed for " + _mountpoint.toLatin1(), true));
     }
   } else {