Changeset 2645 in ntrip for trunk/BNS/bnscaster.cpp

Timestamp:

Nov 5, 2010, 8:25:05 AM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNS/bnscaster.cpp (modified) (4 diffs)

trunk/BNS/bnscaster.cpp

@@ -93 +93 @@
 // Start the Communication with NTRIP Caster
 ////////////////////////////////////////////////////////////////////////////
-void t_bnscaster::open(bool force) {
+void t_bnscaster::open() {
 
   if (_mountpoint.isEmpty()) {
@@ -99 +99 @@
   }
 
-  if (_outSocket != 0) {
-    if ( _outSocket->state() == QAbstractSocket::HostLookupState ||
-         _outSocket->state() == QAbstractSocket::ConnectingState ||
-         _outSocket->state() == QAbstractSocket::ConnectedState ) {
-      return;
-    }
+  if (_outSocket != 0 && 
+      _outSocket->state() == QAbstractSocket::ConnectedState) {
+    return;
   }
 
@@ -113 +110 @@
     _sOpenTrial = 4;
   }
-  if (!force &&
-      _outSocketOpenTime.isValid() &&
+  if (_outSocketOpenTime.isValid() &&
       _outSocketOpenTime.secsTo(QDateTime::currentDateTime()) < minDt) {
     return;
@@ -221 +217 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_bnscaster::write(char* buffer, unsigned len) {
-  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);
-      }
-    }
+  if (_outSocket) {
+    _outSocket->write(buffer, len);
+    _outSocket->flush();
   }
 }