Changeset 3227 in ntrip

Timestamp:

Mar 31, 2011, 6:15:46 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncrtnetuploadcaster.cpp (modified) (2 diffs)
• bncuploadcaster.cpp (modified) (1 diff)

trunk/BNC/upload/bncrtnetuploadcaster.cpp

@@ -337 +337 @@
     }
   }
-  
+
+  QByteArray hlpBufferCo;  
   if (co.NumberOfGPSSat > 0 || co.NumberOfGLONASSSat > 0) {
     char obuffer[CLOCKORBIT_BUFFERSIZE];
@@ -343 +344 @@
     int len = MakeClockOrbit(&co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer));
     if (len > 0) {
-      _outBuffer.append(QByteArray(obuffer, len));
-    }
-  }
-  
+      hlpBufferCo = QByteArray(obuffer, len);
+    }
+  }
+  
+  QByteArray hlpBufferBias;  
   if (bias.NumberOfGPSSat > 0 || bias.NumberOfGLONASSSat > 0) {
     char obuffer[CLOCKORBIT_BUFFERSIZE];
     int len = MakeBias(&bias, BTYPE_AUTO, 0, obuffer, sizeof(obuffer));
     if (len > 0) {
-      _outBuffer.append(QByteArray(obuffer, len));
-    }
+      hlpBufferBias = QByteArray(obuffer, len);
+    }
+  }
+
+  if (hlpBufferCo.size() > 0) {
+    _outBuffer = hlpBufferCo + hlpBufferBias;
   }
 }

trunk/BNC/upload/bncuploadcaster.cpp

@@ -71 +71 @@
       _outSocket->write(_outBuffer);
       _outSocket->flush();
-      _outBuffer.clear();
-    }
-    else {
-      QMutexLocker locker(&_mutex);
-      _outBuffer.clear();
     }
     sleep(5);