Changeset 645 in ntrip

Timestamp:

Dec 19, 2007, 10:07:55 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2Decoder.h (modified) (1 diff)
• RTCM3/RTCM3Decoder.h (modified) (1 diff)
• RTIGS/RTIGSDecoder.h (modified) (1 diff)
• bncgetthread.cpp (modified) (3 diffs)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/RTCM/RTCM2Decoder.h

@@ -33 +33 @@
   public:
     RTCM2Decoder();
-    ~RTCM2Decoder();
+    virtual ~RTCM2Decoder();
     virtual void Decode(char* buffer, int bufLen);
 

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -46 +46 @@
 public:
   RTCM3Decoder();
-  ~RTCM3Decoder();
-  void Decode(char* buffer = 0, int bufLen = 0);
+  virtual ~RTCM3Decoder();
+  virtual void Decode(char* buffer = 0, int bufLen = 0);
 private:
   struct RTCM3ParserData _Parser;

trunk/BNC/RTIGS/RTIGSDecoder.h

@@ -33 +33 @@
 public:
   RTIGSDecoder();
-  ~RTIGSDecoder();
-  void Decode(char* buffer = 0, int bufLen = 0);
+  virtual ~RTIGSDecoder();
+  virtual void Decode(char* buffer = 0, int bufLen = 0);
 private:
   CGPS_Transform _GPSTrans;

trunk/BNC/bncgetthread.cpp

@@ -132 +132 @@
 }
 
+#define AGENTVERSION "1.5"
 // Connect to Caster, send the Request (static)
 ////////////////////////////////////////////////////////////////////////////
@@ -162 +163 @@
   QString uName = QUrl::fromPercentEncoding(mountPoint.userName().toAscii());
   QString passW = QUrl::fromPercentEncoding(mountPoint.password().toAscii());
-  QByteArray userAndPwd = uName.toAscii() + ":" + passW.toAscii();
+  QByteArray userAndPwd;
+
+  if(!uName.isEmpty() || !passW.isEmpty())
+  {
+    userAndPwd = "Authorization: Basic " + (uName.toAscii() + ":" +
+    passW.toAscii()).toBase64() + "\r\n";
+  }
 
   QUrl hlp;
@@ -173 +180 @@
   if ( proxyHost.isEmpty() ) {
    if (hlp.path().indexOf("/") != 0) hlp.setPath("/");
-   reqStr = "GET " + hlp.path().toAscii() + 
-            " HTTP/1.0\r\n"
-            "User-Agent: NTRIP BNC 1.5\r\n"
-            "Authorization: Basic " +
-            userAndPwd.toBase64() + "\r\n";
+     reqStr = "GET " + hlp.path().toAscii() + " HTTP/1.0\r\n";
    } else {
-   reqStr = "GET " + hlp.toEncoded() + 
-            " HTTP/1.0\r\n"
-            "User-Agent: NTRIP BNC 1.5\r\n"
-            "Authorization: Basic " +
-            userAndPwd.toBase64() + "\r\n";
-  }
-  if (hlp.path().indexOf(".skl") > 0) { reqStr += "Host: " + hlp.host().toAscii() + "\r\n"; }
-  reqStr += "\r\n";
+     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";
 
 // NMEA string to handle VRS stream

trunk/BNC/bnctabledlg.cpp

@@ -217 +217 @@
                     _allLines) != success ) {
     QMessageBox::warning(0, "BNC", "Cannot retrieve table of data");
+    _buttonGet->setEnabled(true);
     return;
   }