Changeset 8231 in ntrip for trunk/BNC/src/bncnetqueryrtp.cpp

Timestamp:

Jan 4, 2018, 10:23:05 AM (6 years ago)

Author:

wiese

Message:

CHANGE: #105 QT5

File:

• trunk/BNC/src/bncnetqueryrtp.cpp (modified) (12 diffs)

trunk/BNC/src/bncnetqueryrtp.cpp

@@ -11 +11 @@
  * Created:    27-Dec-2008
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -41 +41 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryRtp::stop() {
@@ -55 +55 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryRtp::slotKeepAlive() {
@@ -68 +68 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryRtp::waitForRequestResult(const QUrl&, QByteArray&) {
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryRtp::waitForReadyRead(QByteArray& outData) {
@@ -115 +115 @@
   QString proxyHost = settings.value("proxyHost").toString();
   int     proxyPort = settings.value("proxyPort").toInt();
- 
+
   if ( proxyHost.isEmpty() ) {
     _socket->connectToHost(_url.host(), _url.port());
@@ -129 +129 @@
     QString passW = QUrl::fromPercentEncoding(_url.password().toLatin1());
     QByteArray userAndPwd;
-    
+
     if(!uName.isEmpty() || !passW.isEmpty()) {
       userAndPwd = "Authorization: Basic " + (uName.toLatin1() + ":" +
@@ -157 +157 @@
 
     _socket->write(reqStr, reqStr.length());
-    
+
     // Read Server Answer 1
     // --------------------
@@ -175 +175 @@
           line = in.readLine();
         }
-    
+
         // Send Request 2
         // --------------
-        if (!_session.isEmpty()) { 
+        if (!_session.isEmpty()) {
 
           // Send initial RTP packet for firewall handling
@@ -198 +198 @@
             rtpbuffer[11] = (sessInt      ) & 0xFF;
 
-            _udpSocket->writeDatagram(rtpbuffer, 12, 
+            _udpSocket->writeDatagram(rtpbuffer, 12,
                               _socket->peerAddress(), serverPort.toInt());
           }
@@ -207 +207 @@
                  + "\r\n";
           _socket->write(reqStr, reqStr.length());
-    
+
           // Read Server Answer 2
           // --------------------
@@ -216 +216 @@
               while (!line.isEmpty()) {
                 if (line.indexOf("200 OK") != -1) {
-                  emit newMessage(_url.encodedPath().replace(0,1,"")
+                  emit newMessage(_url.toEncoded().replace(0,1,"")
                             + ": UDP connection established", true);
                   slotKeepAlive();
@@ -233 +233 @@
   _socket = 0;
   _status = error;
-  emit newMessage(_url.encodedPath().replace(0,1,"")
+  emit newMessage(_url.toEncoded().replace(0,1,"")
                   + ": NetQuery, waiting for connect", true);
 }