Changeset 1275 in ntrip

Timestamp:

Dec 5, 2008, 5:06:54 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncgetthread.cpp (modified) (3 diffs)

trunk/BNC/bncgetthread.cpp

@@ -226 +226 @@
   // Connect the Socket
   // ------------------
-  QSettings settings;
-  QString proxyHost = settings.value("proxyHost").toString();
-  int     proxyPort = settings.value("proxyPort").toInt();
- 
   QTcpSocket* socket = new QTcpSocket();
-  if ( proxyHost.isEmpty() ) {
-    socket->connectToHost(mountPoint.host(), mountPoint.port());
-  }
-  else {
-    socket->connectToHost(proxyHost, proxyPort);
-  }
+
+  socket->connectToHost(mountPoint.host(), mountPoint.port());
+
   if (!socket->waitForConnected(timeOut)) {
     msg += "Connect timeout\n";
@@ -242 +235 @@
     return 0;
   }
+
+  // Set Proxy (application-wide)
+  // ----------------------------
+  QSettings settings;
+  QString proxyHost = settings.value("proxyHost").toString();
+  int     proxyPort = settings.value("proxyPort").toInt();
+
+  QNetworkProxy proxy;
+  if (proxyHost.isEmpty()) {
+    proxy.setType(QNetworkProxy::NoProxy);
+  }
+  else {
+    proxy.setType(QNetworkProxy::Socks5Proxy);
+    proxy.setHostName(proxyHost);
+    proxy.setPort(proxyPort);
+  }
+  QNetworkProxy::setApplicationProxy(proxy);
 
   // Send Request
@@ -260 +270 @@
   hlp.setPort(mountPoint.port());
   hlp.setPath(mountPoint.path());
-
-  QByteArray reqStr;
-  if ( proxyHost.isEmpty() ) {
-    if (hlp.path().indexOf("/") != 0) {
-      hlp.setPath("/");
-    }
-    reqStr = "GET " + hlp.path().toAscii() + " HTTP/1.0\r\n";
-  } else {
-    reqStr = "GET " + hlp.toEncoded() + " HTTP/1.0\r\n";
-  }
-  reqStr += "User-Agent: NTRIP BNC/" AGENTVERSION "\r\n"
-            "Host: " + hlp.host().toAscii() + "\r\n"
-            + userAndPwd + "\r\n";
+  if (hlp.path().indexOf("/") != 0) {
+    hlp.setPath("/");
+  }
+  
+  QByteArray reqStr = "GET " + hlp.path().toAscii() + " HTTP/1.0\r\n" +
+                      "User-Agent: NTRIP BNC/" AGENTVERSION "\r\n"
+                      "Host: " + hlp.host().toAscii() + "\r\n"
+                      + userAndPwd + "\r\n";
 
   // NMEA string to handle VRS stream