Changeset 3210 in ntrip for trunk/BNC/upload

Timestamp:

Mar 31, 2011, 7:49:49 AM (14 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/upload/bncuploadcaster.cpp (modified) (8 diffs)

trunk/BNC/upload/bncuploadcaster.cpp

@@ -191 +191 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncUploadCaster::deleteSafely() {
-  QMutexLocker locker(&_mutex);
   _isToBeDeleted = true;
   if (!isRunning()) {
@@ -214 +213 @@
 void bncUploadCaster::run() {
   while (true) {
-    {
-      QMutexLocker locker(&_mutex);
-      if (_isToBeDeleted) {
-        QThread::quit();
-        deleteLater();
-        return;
-      }
-    }
+    if (_isToBeDeleted) {
+      QThread::quit();
+      deleteLater();
+      return;
+    }
+    open();
     uploadClockOrbitBias();
     msleep(10);
@@ -290 +287 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncUploadCaster::write(char* buffer, unsigned len) {
-  if (_outSocket) {
+  if (_outSocket && _outSocket->state() == QAbstractSocket::ConnectedState) {
     _outSocket->write(buffer, len);
     _outSocket->flush();
@@ -304 +301 @@
   // Append to buffer
   // ----------------
+  const int MAXBUFFSIZE = 1000;
   _rtnetStreamBuffer.append(QByteArray(buffer, bufLen));
+  if (_rtnetStreamBuffer.size() > MAXBUFFSIZE) {
+    _rtnetStreamBuffer = _rtnetStreamBuffer.right(MAXBUFFSIZE);
+  }
 }
 
@@ -322 +323 @@
     for (int ii = 0; ii < hlpLines.size(); ii++) {
       if      (hlpLines[ii].indexOf('*') != -1) {
+        lines.clear();
         QTextStream in(hlpLines[ii].toAscii());
         QString hlp;
@@ -338 +340 @@
     return;
   }
-
-  this->open();
 
   unsigned year, month, day;
@@ -452 +452 @@
   }
   
-  if (_outSocket && (co.NumberOfGPSSat > 0 || co.NumberOfGLONASSSat > 0)) {
+  if (co.NumberOfGPSSat > 0 || co.NumberOfGLONASSSat > 0) {
     char obuffer[CLOCKORBIT_BUFFERSIZE];
   
@@ -461 +461 @@
   }
   
-  if (_outSocket && (bias.NumberOfGPSSat > 0 || bias.NumberOfGLONASSSat > 0)) {
+  if (bias.NumberOfGPSSat > 0 || bias.NumberOfGLONASSSat > 0) {
     char obuffer[CLOCKORBIT_BUFFERSIZE];
     int len = MakeBias(&bias, BTYPE_AUTO, 0, obuffer, sizeof(obuffer));