Changeset 9728 in ntrip for trunk/BNC/src/upload/bncuploadcaster.cpp

Timestamp:

May 20, 2022, 11:59:32 AM (2 years ago)

Author:

stuerze

Message:

minor chenges to test ssl

File:

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

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -211 +211 @@
     if (_outSocket->state() == QAbstractSocket::ConnectedState) {
       return;
-    } else {
-      emit(newMessage(
-          "Broadcaster: No connection for " + _mountpoint.toLatin1(), true));
-    }
-  }
-  delete _outSocket;
-  _outSocket = 0;
+    }
+    delete _outSocket;
+    _outSocket=0;
+  }
 
   double minDt = pow(2.0, _sOpenTrial);
@@ -231 +228 @@
 
   _outSocket = new QSslSocket();
+  _outSocket->setProxy(QNetworkProxy::NoProxy);
   _outSocket->setSslConfiguration(sslConfig);
-  _outSocket->setProxy(QNetworkProxy::NoProxy);
+  
   connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
   connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
@@ -240 +238 @@
       emit(newMessage("No proxy support in Ntrip Version 1 upload!", true));
       delete _outSocket;
-      _outSocket = 0;
+      _outSocket=0;
       return;
     }
@@ -265 +263 @@
             "Proxy: Connection broken for " + _mountpoint.toLatin1()
                 + ": " + ans.left(ans.length() - 2), true));
-        delete _outSocket;
-        _outSocket = 0;
+        //delete _outSocket;
+        //_outSocket=0;
         return;
       } else {
@@ -281 +279 @@
                   + QString("%1) ").arg(_casterOutPort).toLatin1()
                   + _outSocket->errorString().toLatin1(), true));
-          delete _outSocket;
-          _outSocket = 0;
+          //delete _outSocket;
+          //_outSocket=0;
           return;
         } else {
@@ -314 +312 @@
 
   if (ans.indexOf("200") == -1) {
-    delete _outSocket;
-    _outSocket = 0;
+    //delete _outSocket;
+    //_outSocket=0;
     emit(newMessage(
         "Broadcaster: Connection broken for " + _mountpoint.toLatin1() + ": "
@@ -339 +337 @@
               + QString("%1) ").arg(outPort).toLatin1()
               + _outSocket->errorString().toLatin1(), true));
-      delete _outSocket;
-      _outSocket = 0;
+      //delete _outSocket;
+      //_outSocket=0;
       return false;
     } else {
@@ -353 +351 @@
               + QString("%1) ").arg(outPort).toLatin1()
               + _outSocket->errorString().toLatin1(), true));
-      delete _outSocket;
-      _outSocket = 0;
+      //delete _outSocket;
+      //_outSocket=0;
       return false;
     }
@@ -363 +361 @@
 
 void bncUploadCaster::slotSslSocketConnectionClosed() {
+  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
   emit(newMessage("slotSslSocketConnectionClosed", true));
   delete _outSocket;
   _outSocket = 0;
-  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
-}
-
-
-
-
+}
+
+
+
+