Changeset 2643 in ntrip for trunk/BNS

Timestamp:

Nov 4, 2010, 5:25:53 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNS

Files:

• bnscaster.cpp (modified) (4 diffs)
• bnscaster.h (modified) (1 diff)

trunk/BNS/bnscaster.cpp

@@ -93 +93 @@
 // Start the Communication with NTRIP Caster
 ////////////////////////////////////////////////////////////////////////////
-void t_bnscaster::open() {
+void t_bnscaster::open(bool force) {
 
   if (_mountpoint.isEmpty()) {
@@ -99 +99 @@
   }
 
-  if (_outSocket != 0 && 
-      _outSocket->state() == QAbstractSocket::ConnectedState) {
-    return;
+  if (_outSocket != 0) {
+    if ( _outSocket->state() == QAbstractSocket::HostLookupState ||
+         _outSocket->state() == QAbstractSocket::ConnectingState ||
+         _outSocket->state() == QAbstractSocket::ConnectedState ) {
+      return;
+    }
   }
 
@@ -110 +113 @@
     _sOpenTrial = 4;
   }
-  if (_outSocketOpenTime.isValid() &&
+  if (!force &&
+      _outSocketOpenTime.isValid() &&
       _outSocketOpenTime.secsTo(QDateTime::currentDateTime()) < minDt) {
     return;
@@ -217 +221 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bnscaster::write(char* buffer, unsigned len) {
-  if (_outSocket) {
-    unsigned bytesWritten = _outSocket->write(buffer, len);
-    _outSocket->flush();
-    if (bytesWritten != len) {
-      emit(newMessage("Broadcaster: cannot write to socket, closing"));
-      delete _outSocket;
-      _outSocket = 0;
+  for (int iTrial = 1; iTrial <= 2; ++iTrial) {
+    if (_outSocket) {
+      unsigned bytesWritten = _outSocket->write(buffer, len);
+      if (bytesWritten == len) {
+        _outSocket->flush();
+        break;
+      }
+      else {
+        emit(newMessage("Broadcaster: cannot write to socket, closing"));
+        delete _outSocket;
+        _outSocket = 0;
+        open(true);
+      }
     }
   }

trunk/BNS/bnscaster.h

@@ -10 +10 @@
   t_bnscaster(const QString& mountpoint);
   virtual ~t_bnscaster();
-  void open();
+  void open(bool force = false);
   void write(char* buffer, unsigned len);
   void printAscii(const QString& line);