Changeset 3337 in ntrip

Timestamp:

Jul 19, 2011, 4:38:34 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncnetqueryv2.cpp (modified) (2 diffs)
• bncnetqueryv2.h (modified) (2 diffs)
• bncrinex.cpp (modified) (3 diffs)
• bnctabledlg.cpp (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -571 +571 @@
     }
     else if (_ntripVersion == "2") {
-      _query = new bncNetQueryV2();
+      _query = new bncNetQueryV2(false);
     }
     else if (_ntripVersion == "2s") {
-      _query = new bncNetQueryV2();
+      _query = new bncNetQueryV2(true);
     }
     else {

trunk/BNC/bncnetqueryv2.cpp

@@ -23 +23 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncNetQueryV2::bncNetQueryV2() {
+bncNetQueryV2::bncNetQueryV2(bool secure) {
+  _secure    = secure;
   _manager   = new QNetworkAccessManager(this);
   connect(_manager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, 
@@ -93 +94 @@
   _url = url;
   if (_url.scheme().isEmpty()) {
-    _url.setScheme("http");
+    if (_secure) {
+      _url.setScheme("https");
+    }
+    else {
+      _url.setScheme("http");
+    }
   }
   if (_url.path().isEmpty()) {

trunk/BNC/bncnetqueryv2.h

@@ -8 +8 @@
 
  public:
-  bncNetQueryV2();
+  bncNetQueryV2(bool secure);
   virtual ~bncNetQueryV2();
 
@@ -28 +28 @@
   QEventLoop*            _eventLoop;
   bool                   _firstData;
+  bool                   _secure;
 };
 

trunk/BNC/bncrinex.cpp

@@ -55 +55 @@
 #include "bnctabledlg.h"
 #include "bncgetthread.h"
+#include "bncnetqueryv1.h"
 #include "bncnetqueryv2.h"
 #include "bncsettings.h"
@@ -160 +161 @@
     }
 
-    bncNetQueryV2 query;
+    bncNetQuery* query;
+    if      (_ntripVersion == "2s") {
+      query = new bncNetQueryV2(true);
+    }
+    else if (_ntripVersion == "2") {
+      query = new bncNetQueryV2(false);
+    }
+    else {
+      query = new bncNetQueryV1;
+    }
+
     QByteArray outData;
-    query.waitForRequestResult(url, outData);
-    if (query.status() == bncNetQuery::finished) {
+    query->waitForRequestResult(url, outData);
+    if (query->status() == bncNetQuery::finished) {
       _headerLines.clear();
       bool firstLineRead = false;
@@ -206 +217 @@
     } 
     else {
+      delete query;
       return failure;
     }
-
-  }
+    delete query;
+  }
+
   return irc;
 }

trunk/BNC/bnctabledlg.cpp

@@ -199 +199 @@
 
   bncNetQuery* query = 0;
-  if (ntripVersion == "2" || ntripVersion == "2s") {
-    query = new bncNetQueryV2();
+  if      (ntripVersion == "2") {
+    query = new bncNetQueryV2(false);
+  }
+  else if (ntripVersion == "2s") {
+    query = new bncNetQueryV2(true);
   }
   else {
@@ -554 +557 @@
 
   bncNetQuery* query = 0;
-  if (ntripVersion == "2" || ntripVersion == "2s") {
-    query = new bncNetQueryV2();
+  if (ntripVersion == "2") {
+    query = new bncNetQueryV2(false);
+  }
+  else if (ntripVersion == "2s") {
+    query = new bncNetQueryV2(true);
   }
   else {