Changeset 9748 in ntrip

Timestamp:

Jun 1, 2022, 1:33:28 PM (3 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/upload

Files:

• bncuploadcaster.cpp (modified) (12 diffs)
• bncuploadcaster.h (modified) (1 diff)

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -105 +105 @@
   }
   if (_outSocket) {
-    disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
     delete _outSocket;
   }
@@ -142 +141 @@
     }
     emit(newMessage(msg.toLatin1(), true));
-
   }
 }
@@ -194 +192 @@
   }
 
-  if (_outSocket) {
-    if( _outSocket->state() == QAbstractSocket::ConnectedState) {
-      return;
-    }
-    disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-  }
-  delete _outSocket;
-  _outSocket = 0;
+  if (_outSocket != 0 &&
+      _outSocket->state() == QAbstractSocket::ConnectedState) {
+    return;
+  }
+
+  delete _outSocket; _outSocket = 0;
 
   double minDt = pow(2.0, _sOpenTrial);
@@ -217 +213 @@
   _outSocket->setProxy(QNetworkProxy::NoProxy);
 
-  connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-
   if (_sslIgnoreErrors) {
     _outSocket->ignoreSslErrors();
-    emit(newMessage("BNC ignores SSL errors during upload as configured", true));
   } else {
     _outSocket->setSslConfiguration(BNC_SSL_CONFIG);
@@ -234 +227 @@
     if (_ntripVersion == "1") {
       emit(newMessage("No proxy support in Ntrip Version 1 upload!", true));
-      _outSocket->close();
+      delete _outSocket; _outSocket = 0;
       return;
     }
@@ -259 +252 @@
         int l = ans.indexOf("\r\n", 0);
         emit(newMessage("Proxy: Connection broken for " + _mountpoint.toLatin1() + ": "  + ans.left(l), true));
-        _outSocket->close();
+        delete _outSocket; _outSocket = 0;
         return;
       } else {
@@ -271 +264 @@
                           + QString("%1) ").arg(_casterOutPort).toLatin1()
                           + _outSocket->errorString().toLatin1(), true));
+          delete _outSocket; _outSocket = 0;
           return;
         } else {
@@ -290 +284 @@
         + "Connection: close\r\n" + "Transfer-Encoding: chunked\r\n\r\n";
   }
-  //cout << msg.toStdString().c_str();
   _outSocket->write(msg);
   _outSocket->waitForBytesWritten();
@@ -298 +291 @@
 
   if (ans.indexOf("200") == -1) {
-    _outSocket->close();
+    delete _outSocket; _outSocket = 0;
     int l = ans.indexOf("\r\n", 0);
     emit(newMessage("Broadcaster: Connection broken for " + _mountpoint.toLatin1() + ": " + ans.left(l), true));
@@ -319 +312 @@
               + QString("%1) ").arg(outPort).toLatin1()
               + _outSocket->errorString().toLatin1(), true));
+      delete _outSocket; _outSocket = 0;
       return false;
     } else {
@@ -331 +325 @@
               + QString("%1) ").arg(outPort).toLatin1()
               + _outSocket->errorString().toLatin1(), true));
+      delete _outSocket; _outSocket = 0;
       return false;
     }
@@ -338 +333 @@
 
 
-void bncUploadCaster::slotSslSocketConnectionClosed() {
-  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-  if (_outSocket) {
-    delete _outSocket;
-    _outSocket = 0;
-  }
-}
-
-
-
-

trunk/BNC/src/upload/bncuploadcaster.h

@@ -37 +37 @@
   void slotProxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*);
   void slotSslErrors(QList<QSslError>);
-  void slotSslSocketConnectionClosed();
 
  private: