Changeset 1370 in ntrip

Timestamp:

Dec 28, 2008, 11:23:05 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnc.pro (modified) (1 diff)
• bncnetrequest.cpp (deleted)
• bncnetrequest.h (deleted)
• bncsocket.cpp (modified) (11 diffs)
• bncsocket.h (modified) (2 diffs)
• ntrip2test.cpp (deleted)
• ntrip2test.pro (deleted)

trunk/BNC/bnc.pro

@@ -2 +2 @@
 # Switch to debug configuration
 # -----------------------------
-CONFIG -= release
-CONFIG += debug
+CONFIG -= debug
+CONFIG += release
 
 DEFINES += NO_RTCM3_MAIN 

trunk/BNC/bncsocket.cpp

@@ -32 +32 @@
                app, SLOT(slotMessage(const QByteArray,bool)));
   _socket    = 0;
-  _http      = 0;
-  connect(this, SIGNAL(quitEventLoop()), &_eventLoop, SLOT(quit()));
+  _manager   = 0;
+  _reply     = 0;
+  _eventLoop = new QEventLoop();
+  connect(this, SIGNAL(quitEventLoop()), _eventLoop, SLOT(quit()));
 }
 
@@ -39 +41 @@
 ////////////////////////////////////////////////////////////////////////////
 bncSocket::~bncSocket() {
+  delete _eventLoop;
+  delete _reply;
+  delete _manager;
   delete _socket;
-  delete _http;
 }
 
@@ -46 +50 @@
 ////////////////////////////////////////////////////////////////////////////
 QAbstractSocket::SocketState bncSocket::state() const {
-  if      (_http) {
-    if (_http->state() != QHttp::Unconnected) {
+  if      (_manager) {
+    if (_reply) {
       return QAbstractSocket::ConnectedState;
     }
@@ -73 +77 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::bytesAvailable() const {
-  if      (_http) { 
+  if      (_manager) { 
     return _buffer.size();
   }
@@ -87 +91 @@
 ////////////////////////////////////////////////////////////////////////////
 bool bncSocket::canReadLine() const {
-  if      (_http) {
+  if      (_manager) {
     if (_buffer.indexOf('\n') != -1) {
       return true;
@@ -106 +110 @@
 ////////////////////////////////////////////////////////////////////////////
 QByteArray bncSocket::readLine() {
-  if      (_http) {
+  if      (_manager) {
     int ind = _buffer.indexOf('\n');
     if (ind != -1) {
@@ -128 +132 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::waitForReadyRead(int msecs) {
-  if      (_http) {
+  if      (_manager) {
     if (bytesAvailable() > 0) {
       return;
     }
     else {
-      _eventLoop.exec(QEventLoop::ExcludeUserInputEvents);
+      _eventLoop->exec(QEventLoop::ExcludeUserInputEvents);
     }
   }
@@ -144 +148 @@
 ////////////////////////////////////////////////////////////////////////////
 QByteArray bncSocket::read(qint64 maxSize) {
-  if      (_http) {
+  if      (_manager) {
     QByteArray ret = _buffer.left(maxSize);
     _buffer = _buffer.right(_buffer.size()-maxSize);
@@ -289 +293 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotRequestFinished(int /* id */, bool error) {
-  if (error) {
-    emit newMessage("slotRequestFinished " + 
-                    _http->errorString().toAscii(), true);
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotReadyRead(const QHttpResponseHeader&) {
-  _buffer.append(_http->readAll());
+void bncSocket::slotReadyRead() {
+  _buffer.append(_reply->readAll());
   emit quitEventLoop();
 }
@@ -305 +300 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncSocket::slotDone(bool error) {
-  if (error) {
-    emit newMessage("slotDone " + _http->errorString().toAscii(), true);
-  }
+void bncSocket::slotReplyFinished() {
   emit quitEventLoop();
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncSocket::slotError(QNetworkReply::NetworkError) {
+  emit newMessage("slotError " + _reply->errorString().toAscii(), true);
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncSocket::slotSslErrors(const QList<QSslError>&) {
+  emit newMessage("slotSslErrors", true);
 }
 
@@ -318 +322 @@
                          int timeOut, QString& msg) {
 
-
-  delete _http;
-  _http = new QHttp();
-  
-  _http->setHost(url.host());
+  // Network Access Manager
+  // ----------------------
+  if (_manager == 0) {
+    _manager = new QNetworkAccessManager(this);
+  }
+  else {
+    return failure;
+  }
+
+  // Default scheme and path
+  // -----------------------
+  QUrl urlLoc(url);
+  if (urlLoc.scheme().isEmpty()) {
+    urlLoc.setScheme("http");
+  }
+  if (urlLoc.path().isEmpty()) {
+    urlLoc.setPath("/");
+  }
 
   // Network Request
   // ---------------
-  QString path = url.path();
-  if (path.isEmpty()) {
-    path = "/";
-  }
-  QHttpRequestHeader request("GET", path);
-  request.addValue("Host"         , url.host().toAscii());
-  request.addValue("Ntrip-Version", "NTRIP/2.0");
-  request.addValue("User-Agent"   , "NTRIP BNC/" BNCVERSION);
-  if (!url.userName().isEmpty()) {
-    request.addValue("Authorization", "Basic " + 
-                 (url.userName() + ":" + url.password()).toAscii().toBase64());
+  QNetworkRequest request;
+  request.setUrl(urlLoc);
+  request.setRawHeader("Host"         , urlLoc.host().toAscii());
+  request.setRawHeader("Ntrip-Version", "NTRIP/2.0");
+  request.setRawHeader("User-Agent"   , "NTRIP BNC/1.7");
+  if (!urlLoc.userName().isEmpty()) {
+    request.setRawHeader("Authorization", "Basic " + 
+           (urlLoc.userName() + ":" + urlLoc.password()).toAscii().toBase64());
   } 
-  request.addValue("Connection"   , "close");
-
-
-  connect(_http, SIGNAL(done(bool)), this, SLOT(slotDone(bool)));
-  connect(_http, SIGNAL(requestFinished(int, bool)), 
-          this, SLOT(slotRequestFinished(int, bool)));
-  connect(_http, SIGNAL(readyRead(const QHttpResponseHeader&)), 
-          this, SLOT(slotReadyRead(const QHttpResponseHeader&)));
-
-  _http->request(request);
+  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;

trunk/BNC/bncsocket.h

@@ -29 +29 @@
 
  private slots:
-  void slotDone(bool);
-  void slotRequestFinished(int, bool);
-  void slotReadyRead(const QHttpResponseHeader&);
+  void slotReplyFinished();
+  void slotReadyRead();
+  void slotError(QNetworkReply::NetworkError);
+  void slotSslErrors(const QList<QSslError>&);
 
  private:
@@ -38 +39 @@
                  int timeOut, QString& msg);
 
-  QTcpSocket* _socket;
-  QHttp*      _http;      
-  QByteArray  _buffer;
-  QEventLoop  _eventLoop;
+  QTcpSocket*            _socket;
+  QNetworkAccessManager* _manager;
+  QNetworkReply*         _reply;
+  QEventLoop*            _eventLoop;
+  QByteArray             _buffer;
 };