Changeset 8275 in ntrip for trunk/BNC/src/upload

Timestamp:

Feb 7, 2018, 2:26:39 PM (6 years ago)

Author:

stuerze

Message:

some preparation to allow Ntrip version 2 stream upload in future

Location:

trunk/BNC/src/upload

Files:

• bncephuploadcaster.cpp (modified) (1 diff)
• bncrtnetdecoder.cpp (modified) (5 diffs)
• bncrtnetuploadcaster.cpp (modified) (1 diff)
• bncrtnetuploadcaster.h (modified) (1 diff)
• bncuploadcaster.cpp (modified) (1 diff)
• bncuploadcaster.h (modified) (3 diffs)

trunk/BNC/src/upload/bncephuploadcaster.cpp

@@ -35 +35 @@
   while (it.hasNext()) {
     QStringList hlp = it.next().split(",");
-    if (hlp.size() > 3) {
+    if (hlp.size() > 5) {
       ++iRow;
       int  outPort = hlp[1].toInt();
       bncUploadCaster* newCaster = new bncUploadCaster(hlp[2], hlp[0], outPort,
-                                                       hlp[3], iRow, sampl);
+                                                       hlp[3], hlp[4],
+                                                       hlp[5], iRow, sampl);
 
       connect(newCaster, SIGNAL(newBytes(QByteArray,double)),

trunk/BNC/src/upload/bncrtnetdecoder.cpp

@@ -35 +35 @@
  * Created:    28-Mar-2011
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -46 +46 @@
 
 // Constructor
-//////////////////////////////////////////////////////////////////////// 
+////////////////////////////////////////////////////////////////////////
 bncRtnetDecoder::bncRtnetDecoder() {
   bncSettings settings;
@@ -59 +59 @@
       ++iRow;
       int  outPort = hlp[1].toInt();
-      bool CoM     = (hlp[5].toInt() == Qt::Checked);
+      bool CoM     = (hlp[7].toInt() == Qt::Checked);
       int PID = 0;
-      if (hlp.size() > 8) {
-        PID = hlp[8].toInt();
+      if (hlp.size() > 10) {
+        PID = hlp[10].toInt();
       }
       int SID = 0;
-      if (hlp.size() > 9) {
-        SID = hlp[9].toInt();
+      if (hlp.size() > 11) {
+        SID = hlp[11].toInt();
       }
       int IOD = 0;
-      if (hlp.size() > 10) {
-        IOD = hlp[10].toInt();
+      if (hlp.size() > 12) {
+        IOD = hlp[12].toInt();
       }
       bncRtnetUploadCaster* newCaster = new bncRtnetUploadCaster(
-                                                       hlp[2], hlp[0], outPort, 
-                                                       hlp[3], hlp[4], CoM,
-                                                       hlp[6], hlp[7], 
+                                                       hlp[2], hlp[0], outPort,
+                                                       hlp[3], hlp[4],
+                                                       hlp[5], hlp[6], CoM,
+                                                       hlp[8], hlp[9],
                                                        PID, SID, IOD, iRow);
       newCaster->start();
@@ -84 +85 @@
 
 // Destructor
-//////////////////////////////////////////////////////////////////////// 
+////////////////////////////////////////////////////////////////////////
 bncRtnetDecoder::~bncRtnetDecoder() {
   for (int ic = 0; ic < _casters.size(); ic++) {
@@ -92 +93 @@
 
 // Decode Method
-//////////////////////////////////////////////////////////////////////// 
+////////////////////////////////////////////////////////////////////////
 t_irc bncRtnetDecoder::Decode(char* buffer, int bufLen, vector<string>& errmsg) {
   errmsg.clear();

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -28 +28 @@
 ////////////////////////////////////////////////////////////////////////////
 bncRtnetUploadCaster::bncRtnetUploadCaster(const QString& mountpoint,
-    const QString& outHost, int outPort, const QString& password,
+    const QString& outHost, int outPort,
+    const QString& ntripVersion,
+    const QString& userName, const QString& password,
     const QString& crdTrafo, bool CoM, const QString& sp3FileName,
     const QString& rnxFileName, int PID, int SID, int IOD, int iRow) :
-    bncUploadCaster(mountpoint, outHost, outPort, password, iRow, 0) {
+    bncUploadCaster(mountpoint, outHost, outPort, ntripVersion, userName, password, iRow, 0) {
 
   if (!outHost.isEmpty()) {

trunk/BNC/src/upload/bncrtnetuploadcaster.h

@@ -20 +20 @@
   bncRtnetUploadCaster(const QString& mountpoint,
                   const QString& outHost, int outPort,
-                  const QString& password,
+                  const QString& ntripVersion,
+                  const QString& userName,const QString& password,
                   const QString& crdTrafo, bool  CoM,
                   const QString& sp3FileName,

trunk/BNC/src/upload/bncuploadcaster.cpp

@@ -27 +27 @@
 bncUploadCaster::bncUploadCaster(const QString& mountpoint,
                                  const QString& outHost, int outPort,
-                                 const QString& password, int iRow,
+                                 const QString& ntripVersion,
+                                 const QString& userName, const QString& password,
+                                 int iRow,
                                  int rate) {
   _mountpoint    = mountpoint;
   _outHost       = outHost;
   _outPort       = outPort;
+  _ntripVersion  = ntripVersion;
+  _userName      = userName;
   _password      = password;
   _outSocket     = 0;

trunk/BNC/src/upload/bncuploadcaster.h

@@ -11 +11 @@
  public:
   bncUploadCaster(const QString& mountpoint,
-                  const QString& outHost, int outPort,
-                  const QString& password, int iRow, int rate);
+      const QString& outHost, int outPort,
+      const QString& ntripVersion,
+      const QString& userName, const QString& password,
+      int iRow, int rate);
   virtual void deleteSafely();
   void setOutBuffer(const QByteArray& outBuffer) {
@@ -21 +23 @@
  protected:
   virtual    ~bncUploadCaster();
-  QMutex     _mutex;  
+  QMutex     _mutex;
   QByteArray _outBuffer;
 
@@ -35 +37 @@
   QString     _outHost;
   int         _outPort;
+  QString     _userName;
   QString     _password;
+  QString     _ntripVersion;
+  bool        _secure;
   QTcpSocket* _outSocket;
   int         _sOpenTrial;