Changeset 473 in ntrip for trunk/BNC

Timestamp:

Jun 18, 2007, 2:22:14 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -256 +256 @@
   if (_socket->canReadLine()) {
     QString line = _socket->readLine();
+
+    // Skip messages from proxy server
+    // -------------------------------
+    if (line.indexOf("ICY 200 OK") == -1 && 
+        line.indexOf("200 OK")     != -1 ) {
+      bool proxyRespond = true;
+      while (true) {
+        if (_socket->canReadLine()) {
+          line = _socket->readLine();
+          if (!proxyRespond) {
+            break;
+          }
+          if (line.trimmed().isEmpty()) {
+            proxyRespond = false;
+          }
+        }
+        else {
+          _socket->waitForReadyRead(_timeOut);
+        }
+      }
+    }
+
     if (line.indexOf("Unauthorized") != -1) {
       QStringList table;

trunk/BNC/bnctabledlg.cpp

@@ -157 +157 @@
   // Read Caster Response
   // --------------------
+  bool proxyRespond = false;
   bool first = true;
   while (true) {
     if (socket->canReadLine()) {
       QString line = socket->readLine();
+
+      // Skip messages from proxy server
+      // -------------------------------
+      if (line.indexOf("SOURCETABLE 200 OK") == -1 && 
+          line.indexOf("200 OK")             != -1 ) {
+        proxyRespond = true;
+      }
+      if (proxyRespond) {
+        if (line.trimmed().isEmpty()) {
+          proxyRespond = false;
+        }
+        continue;
+      }
+
       allLines.push_back(line);
       if (first) {