Changeset 249 in ntrip

Timestamp:

Oct 14, 2006, 10:34:27 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2.cpp (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)

trunk/BNC/RTCM/RTCM2.cpp ¶

@@ -502 +502 @@
   
   if (n>32) {
-    cerr << "Error: can't handle >32 bits in RTCM2packet::getUnsignedBits" 
-         << endl;
-    return 0; // exit(-1);
+    throw("Error: can't handle >32 bits in RTCM2packet::getUnsignedBits");
   };
   
   if ( 24*DW.size() < start+n-1 ) {
-    cerr << "Error: Packet too short in RTCM2packet::getUnsignedBits" << endl;
-    return 0; // exit(-1);
+    throw("Error: Packet too short in RTCM2packet::getUnsignedBits");
   }
 
@@ -554 +551 @@
   
   if (n>32) {
-    cerr << "Error: can't handle >32 bits in RTCM2packet::getBits" 
-         << endl;
-    return 0; // exit(-1);
+    throw("Error: can't handle >32 bits in RTCM2packet::getBits");
   };
   
   if ( 24*DW.size() < start+n-1 ) {
-    cerr << "Error: Packet too short in RTCM2packet::getBits" << endl;
-    return 0; // exit(-1);
+    throw("Error: Packet too short in RTCM2packet::getBits");
   }
 

trunk/BNC/bncgetthread.cpp ¶

@@ -218 +218 @@
   // ------------------
   while (true) {
-
-    if (_socket->state() != QAbstractSocket::ConnectedState) {
-      emit(newMessage(_staID + ": Socket not connected, reconnecting"));
-      tryReconnect();
-    }
-
-    _socket->waitForReadyRead(_timeOut);
-    qint64 nBytes = _socket->bytesAvailable();
-    if (nBytes > 0) {
-      char* data = new char[nBytes];
-      _socket->read(data, nBytes);
-      _decoder->Decode(data, nBytes);
-      delete data;
-      for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
-           it != _decoder->_obsList.end(); it++) {
-        emit newObs(_staID, *it);
-        _global_caster->newObs(_staID, *it);
-      }
-      _decoder->_obsList.clear();
-    }
-    else {
-      emit(newMessage(_staID + ": Data Timeout, reconnecting"));
+    try {
+      if (_socket->state() != QAbstractSocket::ConnectedState) {
+        emit(newMessage(_staID + ": Socket not connected, reconnecting"));
+        tryReconnect();
+      }
+      
+      
+      _socket->waitForReadyRead(_timeOut);
+      qint64 nBytes = _socket->bytesAvailable();
+      if (nBytes > 0) {
+        char* data = new char[nBytes];
+        _socket->read(data, nBytes);
+        _decoder->Decode(data, nBytes);
+        delete data;
+        for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
+             it != _decoder->_obsList.end(); it++) {
+          emit newObs(_staID, *it);
+          _global_caster->newObs(_staID, *it);
+        }
+        _decoder->_obsList.clear();
+      }
+      else {
+        emit(newMessage(_staID + ": Data Timeout, reconnecting"));
+        tryReconnect();
+      }
+    }
+    catch (const char* msg) {
+      emit(newMessage(_staID + msg));
       tryReconnect();
     }