Changeset 1367 in ntrip for trunk/BNC/bncsocket.cpp

Timestamp:

Dec 27, 2008, 11:22:13 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncsocket.cpp (modified) (4 diffs)

trunk/BNC/bncsocket.cpp

@@ -5 +5 @@
  * Class:      bncSocket
  *
- * Purpose:    Combines QTcpSocket (NTRIP v1) and  QNetworkReply (NTRIP v2)
+ * Purpose:    Combines QTcpSocket (NTRIP v1) and QHttp (NTRIP v2)
  *
  * Author:     L. Mervart
@@ -17 +17 @@
 #include <iostream>
 #include <iomanip>
+
+#include <string.h>
 
 #include "bncsocket.h"
@@ -46 +48 @@
 ////////////////////////////////////////////////////////////////////////////
 QAbstractSocket::SocketState bncSocket::state() const {
-  if (_socket) {
+  if      (_http) {
+    if (_http->state() != QHttp::Unconnected) {
+      return QAbstractSocket::ConnectedState;
+    }
+    else {
+      return QAbstractSocket::UnconnectedState;
+    }
+  }
+  else if (_socket) {
     return _socket->state();
   }
@@ -136 +146 @@
 ////////////////////////////////////////////////////////////////////////////
 qint64 bncSocket::read(char* data, qint64 maxlen) {
-  if (_socket) {
+  if      (_http) {
+    strncpy(data, _buffer.data(), maxlen);
+    _buffer = _buffer.right(_buffer.size()-maxlen);
+    return maxlen; 
+  }
+  else if (_socket) {
     return _socket->read(data, maxlen);
   }