Changeset 1356 in ntrip

Timestamp:

Dec 27, 2008, 2:54:58 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (13 diffs)
• bncsocket.h (modified) (1 diff)

trunk/BNC/bncsocket.cpp

@@ -52 +52 @@
 void bncSocket::connectToHost(const QString &hostName, quint16 port, 
                               QIODevice::OpenMode mode) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+  }
+  else
+#endif
   if (_socket) {
     _socket->connectToHost(hostName, port, mode);
@@ -60 +65 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::waitForConnected(int msecs) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return true;
+  }
+  else
+#endif
   if (_socket) {
     return _socket->waitForConnected(msecs);
@@ -71 +82 @@
 ////////////////////////////////////////////////////////////////////////////
 QAbstractSocket::SocketState bncSocket::state() const {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return QAbstractSocket::ConnectedState;
+  }
+  else
+#endif
   if (_socket) {
     return _socket->state();
@@ -82 +99 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::close() {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    _reply->close();
+  }
+  else
+#endif
   if (_socket) {
     _socket->close();
@@ -90 +113 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::bytesAvailable() const {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->bytesAvailable();
+  }
+  else
+#endif
   if (_socket) {
     return _socket->bytesAvailable();
@@ -101 +130 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::canReadLine() const {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->canReadLine();
+  }
+  else
+#endif
   if (_socket) {
     return _socket->canReadLine();
@@ -112 +147 @@
 ////////////////////////////////////////////////////////////////////////////
 QByteArray bncSocket::readLine(qint64 maxlen) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->readLine(maxlen);
+  }
+  else
+#endif
   if (_socket) {
     return _socket->readLine(maxlen);
@@ -123 +164 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::waitForReadyRead(int msecs) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->waitForReadyRead(msecs);
+  }
+  else
+#endif
   if (_socket) {
     return _socket->waitForReadyRead(msecs);
@@ -134 +181 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::read(char* data, qint64 maxlen) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->read(data, maxlen);
+  }
+  else
+#endif
   if (_socket) {
     return _socket->read(data, maxlen);
@@ -145 +198 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::write(const char* data, qint64 len) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return -1;
+  }
+  else
+#endif
   if (_socket) {
     return _socket->write(data, len);
@@ -156 +215 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::waitForBytesWritten(int msecs) {
+#if QT_VERSION >= 0x040400
+  if (_reply) {
+    return _reply->waitForBytesWritten(msecs);
+  }
+  else
+#endif
   if (_socket) {
     return _socket->waitForBytesWritten(msecs);
@@ -330 +395 @@
 // Connect to Caster NTRIP Version 2
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncSocket::request2(const QUrl& mountPoint, const QByteArray& latitude, 
+t_irc bncSocket::request2(const QUrl& url, const QByteArray& latitude, 
                          const QByteArray& longitude, const QByteArray& nmea,
                          int timeOut, QString& msg) {
@@ -337 +402 @@
   return failure;
 #else
-
-#endif
-}
+  // Network Access Manager
+  // ----------------------
+  if (_manager == 0) {
+    _manager = new QNetworkAccessManager(this);
+  }
+  else {
+    return failure;
+  }
+
+  // Network Request
+  // ---------------
+  QNetworkRequest request;
+  request.setUrl(url);
+  request.setRawHeader("Host"         , url.host().toAscii());
+  request.setRawHeader("Ntrip-Version", "NTRIP/2.0");
+  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  if (!url.userName().isEmpty()) {
+    request.setRawHeader("Authorization", "Basic " + 
+                 (url.userName() + ":" + url.password()).toAscii().toBase64());
+  } 
+  request.setRawHeader("Connection"   , "close");
+
+  _reply = _manager->get(request);
+
+  connect(_reply, SIGNAL(finished()), this, SLOT(slotReplyFinished()));
+  connect(_reply, SIGNAL(readyRead()), this, SLOT(slotReadyRead()));
+  connect(_reply, SIGNAL(error(QNetworkReply::NetworkError)),
+          this, SLOT(slotError(QNetworkReply::NetworkError)));
+  connect(_reply, SIGNAL(sslErrors(const QList<QSslError>&)), 
+          this, SLOT(slotSslErrors(const QList<QSslError>&)));
+
+  return success;
+#endif
+}

trunk/BNC/bncsocket.h

@@ -41 +41 @@
 
  private:
-  t_irc request2(const QUrl& mountPoint, const QByteArray& latitude, 
+  t_irc request2(const QUrl& url, const QByteArray& latitude, 
                  const QByteArray& longitude, const QByteArray& nmea, 
                  int timeOut, QString& msg);