Changeset 7180 in ntrip for trunk/BNC/src/bnccaster.cpp

Timestamp:

Aug 14, 2015, 10:57:56 AM (9 years ago)

Author:

stuerze

Message:

NMEA TCP port functionlity removed into bncgetthread class in order to have it available for each PPP station

File:

• trunk/BNC/src/bnccaster.cpp (modified) (6 diffs)

trunk/BNC/src/bnccaster.cpp

@@ -96 +96 @@
   }
 
-  int nmeaPort = settings.value("PPP/nmeaPort").toInt();
-  if (nmeaPort != 0) {
-    _nmeaServer = new QTcpServer;
-    if ( !_nmeaServer->listen(QHostAddress::Any, nmeaPort) ) {
-      emit newMessage("bncCaster: Cannot listen on port", true);
-    }
-    connect(_nmeaServer, SIGNAL(newConnection()), this, SLOT(slotNewNMEAConnection()));
-    connect(BNC_CORE, SIGNAL(newNMEAstr(QByteArray, QByteArray)), 
-            this,     SLOT(slotNewNMEAstr(QByteArray, QByteArray)));
-    _nmeaSockets = new QList<QTcpSocket*>;
-  }
-  else {
-    _nmeaServer  = 0;
-    _nmeaSockets = 0;
-  }
-
   _samplingRate = settings.value("binSampl").toInt();
   _waitTime     = settings.value("waitTime").toDouble();
@@ -154 +138 @@
   delete _uServer;
   delete _uSockets;
-  delete _nmeaServer;
-  delete _nmeaSockets;
   delete _miscServer;
   delete _miscSockets;
@@ -254 +236 @@
   emit( newMessage(QString("New client connection on usync port: # %1")
                    .arg(_uSockets->size()).toAscii(), true) );
-}
-
-void bncCaster::slotNewNMEAConnection() {
-  _nmeaSockets->push_back( _nmeaServer->nextPendingConnection() );
-  emit( newMessage(QString("New PPP client on port: # %1")
-                   .arg(_nmeaSockets->size()).toAscii(), true) );
 }
 
@@ -337 +313 @@
             firstObs = false;
             oStr << "> " << obs._time.gpsw() << ' ' 
-                 << setprecision(7) << obs._time.gpssec() << endl;;
+                 << setprecision(7) << obs._time.gpssec() << endl;
           }
           oStr << obs._staID << ' ' << bncRinex::asciiSatLine(obs) << endl;
@@ -436 +412 @@
                                         longitude, nmea, ntripVersion);
       addGetThread(getThread);
+
     }
   }
@@ -519 +496 @@
   }
   return -1;
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotNewNMEAstr(QByteArray /* staID */, QByteArray str) {
-  if (_nmeaSockets) {
-    QMutableListIterator<QTcpSocket*> is(*_nmeaSockets);
-    while (is.hasNext()) {
-      QTcpSocket* sock = is.next();
-      if (sock->state() == QAbstractSocket::ConnectedState) {
-        sock->write(str);
-      }
-      else if (sock->state() != QAbstractSocket::ConnectingState) {
-        delete sock;
-        is.remove();
-      }
-    }
-  }
 }