Changeset 1358 in ntrip

Timestamp:

Dec 27, 2008, 4:18:43 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncsocket.cpp (modified) (5 diffs)
• bnctabledlg.cpp (modified) (1 diff)

trunk/BNC/bncsocket.cpp

@@ -292 +292 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::slotRequestFinished(int id, bool error) {
-  cout << "slotRequestFinished " << id << " " << error << endl;
-  this->deleteLater();
+  cout << "slotRequestFinished " << id << endl;
+  if (error) {
+    cout << "error: " << _http->error() << " " 
+         << _http->errorString().toAscii().data() << endl;
+  }
 }
 
@@ -300 +303 @@
 void bncSocket::slotReadyRead(const QHttpResponseHeader&) {
   cout << "slotReadyRead" << endl;
+  QByteArray buffer = _http->readAll();
+  cout << buffer.data();
 }
 
@@ -311 +316 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncSocket::slotDone(bool error) {
-  cout << "slotDone " << error << endl;
+  cout << "slotDone " << endl;
+  if (error) {
+    cout << "error: " << _http->error() << " " 
+         << _http->errorString().toAscii().data() << endl;
+  }
 }
 
@@ -328 +337 @@
   _http->setSocket(_socket);
 
+  _http->setHost(url.host());
+
   // Network Request
   // ---------------
-  QHttpRequestHeader request("GET", url.path());
+  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/1.7");
+  request.addValue("User-Agent"   , "NTRIP BNC/" BNCVERSION);
   if (!url.userName().isEmpty()) {
     request.addValue("Authorization", "Basic " + 
@@ -349 +364 @@
           this, SLOT(slotSslErrors(const QList<QSslError>&)));
 
+  _http->request(request);
+
   return success;
 }

trunk/BNC/bnctabledlg.cpp

@@ -219 +219 @@
     }
   }
-  delete socket;
+  ///  delete socket;
 
   allTables.insert(casterHost, allLines);