Changeset 2645 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNS

Files:

• bnscaster.cpp (modified) (4 diffs)
• bnscaster.h (modified) (1 diff)
• bnseph.cpp (modified) (2 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();
   }
 }

trunk/BNS/bnscaster.h

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

trunk/BNS/bnseph.cpp

@@ -90 +90 @@
   const int timeOut = 30*1000;  // 30 seconds
   if (!_socket->waitForConnected(timeOut)) {
-    emit(newMessage("bnseph::reconnect: Connect Timeout"));
+//  emit(newMessage("bnseph::run Connect Timeout"));
+    emit(newMessage("Ephemeris server: Connection timeout")); // weber
     msleep(1000);
   }
@@ -99 +100 @@
 void t_bnseph::run() {
 
-  emit(newMessage("bnseph::run: Start"));
+//emit(newMessage("bnseph::run Start"));
+  emit(newMessage("Ephemeris server: Connection opened")); // weber
 
   while (true) {
     if ( _socket == 0 ||
-         (_socket->state() != QAbstractSocket::HostLookupState &&
-          _socket->state() != QAbstractSocket::ConnectingState &&
+         (_socket->state() != QAbstractSocket::ConnectingState &&
           _socket->state() != QAbstractSocket::ConnectedState) ) {
       reconnect();