Changeset 829 in ntrip for trunk

Timestamp:

Apr 15, 2008, 10:24:31 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (2 diffs)
• bnseph.cpp (modified) (2 diffs)

trunk/BNS/bns.cpp

@@ -74 +74 @@
     }
   }
+
+  openCaster();
 }
 
@@ -216 +218 @@
     if (_clkSocket && _clkSocket->state() == QAbstractSocket::ConnectedState) {
       if ( _clkSocket->canReadLine()) {
-        if (_outSocket == 0) {
-          openCaster();
-        }
         readEpoch();
       }

trunk/BNS/bnseph.cpp

@@ -26 +26 @@
 ////////////////////////////////////////////////////////////////////////////
 t_bnseph::t_bnseph(QObject* parent) : QThread(parent) {
-  _socket = 0;
+
+  QSettings settings;
+  QString host = "localhost";
+  int     port = settings.value("ephPort").toInt();
+
+  _socket = new QTcpSocket();
+  _socket->connectToHost(host, port);
+
+  const int timeOut = 3*1000;  // 3 seconds
+  if (!_socket->waitForConnected(timeOut)) {
+    emit(error("bnseph::run Connect Timeout"));
+  }
 }
 
@@ -41 +52 @@
   emit(newMessage("bnseph::run Start"));
 
-  // Connect the Socket
-  // ------------------
-  QSettings settings;
-  QString host = "localhost";
-  int     port = settings.value("ephPort").toInt();
-
-  _socket = new QTcpSocket();
-  _socket->connectToHost(host, port);
-
-  const int timeOut = 3*1000;  // 3 seconds
-  if (!_socket->waitForConnected(timeOut)) {
-    emit(error("bnseph::run Connect Timeout"));
-  }
-  else {
-    while (true) {
-      if (_socket->state() != QAbstractSocket::ConnectedState) {
-        emit(error("bnseph::not connected"));
-        break;
-      }
-      if (_socket->canReadLine()) {
-        readEph();
-      }
-      else {
-        _socket->waitForReadyRead(10);
-      }
+  while (true) {
+    if (_socket->state() != QAbstractSocket::ConnectedState) {
+      emit(error("bnseph::not connected"));
+      break;
+    }
+    if (_socket->canReadLine()) {
+      readEph();
+    }
+    else {
+      _socket->waitForReadyRead(10);
     }
   }