Changeset 1816 in ntrip

Timestamp:

Apr 28, 2009, 11:00:06 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncnetquery.h (modified) (1 diff)
• bncnetqueryv1.cpp (modified) (3 diffs)

trunk/BNC/bncgetthread.cpp

@@ -506 +506 @@
         _nextSleep = 256;
       }
+#ifdef MLS_SOFTWARE
+      if (_nextSleep > 10) {
+        _nextSleep = 10;
+      }
+#endif
     }
 

trunk/BNC/bncnetquery.h

@@ -10 +10 @@
 
  public:
-  enum queryStatus {init, running, finished, error, fatal};
+  enum queryStatus {init, running, finished, error};
 
   bncNetQuery() {

trunk/BNC/bncnetqueryv1.cpp

@@ -57 +57 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV1::waitForReadyRead(QByteArray& outData) {
-
-  if (_status == bncNetQuery::fatal) {
-    return;
-  }
-
   if (_socket && _socket->state() == QAbstractSocket::ConnectedState) {
     while (true) {
@@ -88 +83 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryV1::startRequest(const QUrl& url, const QByteArray& gga) {
-
-  if (_status == bncNetQuery::fatal) {
-    return;
-  }
 
   _status = running;
@@ -221 +212 @@
     delete _socket;
     _socket = 0;
-    _status = fatal;
+    _status = error;
     emit newMessage(_url.path().toAscii().replace(0,1,"") 
                     + ": Wrong caster response\n"