Index: trunk/BNC/bnc.pro =================================================================== --- trunk/BNC/bnc.pro (revision 1382) +++ trunk/BNC/bnc.pro (revision 1383) @@ -29,5 +29,5 @@ bnccaster.h bncrinex.h bncapp.h bncutils.h bnchlpdlg.h \ bncconst.h bnchtml.h bnctableitem.h bnczerodecoder.h \ - bncsocket.h bncnetquery.h bncnetqueryv2.h \ + bncnetquery.h bncnetqueryv1.h bncnetqueryv2.h \ RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h \ RTCM/RTCM2_2021.h RTCM/rtcm_utils.h \ @@ -47,5 +47,5 @@ bnccaster.cpp bncrinex.cpp bncapp.cpp bncutils.cpp \ bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp \ - bnczerodecoder.cpp bncsocket.cpp bncnetqueryv2.cpp \ + bnczerodecoder.cpp bncnetqueryv1.cpp bncnetqueryv2.cpp \ RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp \ RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp \ Index: trunk/BNC/bncapp.cpp =================================================================== --- trunk/BNC/bncapp.cpp (revision 1382) +++ trunk/BNC/bncapp.cpp (revision 1383) @@ -147,5 +147,5 @@ // Write a Program Message //////////////////////////////////////////////////////////////////////////// -void bncApp::slotMessage(const QByteArray msg, bool showOnScreen) { +void bncApp::slotMessage(QByteArray msg, bool showOnScreen) { QMutexLocker locker(&_mutexMessage); Index: trunk/BNC/bncapp.h =================================================================== --- trunk/BNC/bncapp.h (revision 1382) +++ trunk/BNC/bncapp.h (revision 1383) @@ -45,5 +45,5 @@ void setWaitCoTime(int waitCoTime) {_waitCoTime = waitCoTime;} public slots: - void slotMessage(const QByteArray msg, bool showOnScreen); + void slotMessage(QByteArray msg, bool showOnScreen); void slotNewGPSEph(gpsephemeris* gpseph); void slotNewGlonassEph(glonassephemeris* glonasseph); Index: trunk/BNC/bncnetquery.h =================================================================== --- trunk/BNC/bncnetquery.h (revision 1382) +++ trunk/BNC/bncnetquery.h (revision 1383) @@ -4,4 +4,5 @@ #include #include "bncconst.h" +#include "bncapp.h" class bncNetQuery : public QObject { @@ -11,5 +12,8 @@ enum queryStatus {init, running, finished, error}; - bncNetQuery(); + bncNetQuery() { + connect(this, SIGNAL(newMessage(QByteArray,bool)), + (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool))); + } virtual ~bncNetQuery(); Index: trunk/BNC/bncnetqueryv1.cpp =================================================================== --- trunk/BNC/bncnetqueryv1.cpp (revision 1382) +++ trunk/BNC/bncnetqueryv1.cpp (revision 1383) @@ -3,5 +3,5 @@ * ------------------------------------------------------------------------- * - * Class: bncSocket + * Class: bncNetQueryV1 * * Purpose: Blocking Network Requests (NTRIP Version 1) @@ -28,8 +28,5 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -bncSocket::bncSocket() { - bncApp* app = (bncApp*) qApp; - app->connect(this, SIGNAL(newMessage(QByteArray,bool)), - app, SLOT(slotMessage(const QByteArray,bool))); +bncNetQueryV1::bncNetQueryV1() { _socket = 0; } @@ -37,5 +34,5 @@ // Destructor //////////////////////////////////////////////////////////////////////////// -bncSocket::~bncSocket() { +bncNetQueryV1::~bncNetQueryV1() { delete _socket; } @@ -43,5 +40,5 @@ // //////////////////////////////////////////////////////////////////////////// -void bncSocket::close() { +void bncNetQueryV1::close() { if (_socket) { _socket->close(); @@ -51,5 +48,5 @@ // //////////////////////////////////////////////////////////////////////////// -qint64 bncSocket::bytesAvailable() const { +qint64 bncNetQueryV1::bytesAvailable() const { if (_socket) { return _socket->bytesAvailable(); @@ -62,5 +59,5 @@ // //////////////////////////////////////////////////////////////////////////// -bool bncSocket::canReadLine() const { +bool bncNetQueryV1::canReadLine() const { if (_socket) { return _socket->canReadLine(); @@ -73,5 +70,5 @@ // //////////////////////////////////////////////////////////////////////////// -QByteArray bncSocket::readLine() { +QByteArray bncNetQueryV1::readLine() { if (_socket) { return _socket->readLine(); @@ -84,5 +81,5 @@ // //////////////////////////////////////////////////////////////////////////// -void bncSocket::waitForReadyRead(int msecs) { +void bncNetQueryV1::waitForReadyRead(int msecs) { if (_socket) { _socket->waitForReadyRead(msecs); @@ -92,5 +89,5 @@ // //////////////////////////////////////////////////////////////////////////// -QByteArray bncSocket::read(qint64 maxSize) { +QByteArray bncNetQueryV1::read(qint64 maxSize) { if (_socket) { return _socket->read(maxSize); @@ -103,5 +100,5 @@ // Connect to Caster, send the Request //////////////////////////////////////////////////////////////////////////// -t_irc bncSocket::request(const QUrl& mountPoint, const QByteArray& latitude, +t_irc bncNetQueryV1::request(const QUrl& mountPoint, const QByteArray& latitude, const QByteArray& longitude, const QByteArray& nmea, const QByteArray& ntripVersion, Index: trunk/BNC/bncnetqueryv1.h =================================================================== --- trunk/BNC/bncnetqueryv1.h (revision 1382) +++ trunk/BNC/bncnetqueryv1.h (revision 1383) @@ -1,14 +1,13 @@ -#ifndef BNCSOCKET_H -#define BNCSOCKET_H +#ifndef BNCNETQUERYV1_H +#define BNCNETQUERYV1_H -#include -#include "bncconst.h" +#include "bncnetquery.h" -class bncSocket : public QObject { +class bncNetQueryV1 : public bncNetQuery { Q_OBJECT public: - bncSocket(); - ~bncSocket(); + bncNetQueryV1(); + ~bncNetQueryV1(); void close(); Index: trunk/BNC/bncsocket.cpp =================================================================== --- trunk/BNC/bncsocket.cpp (revision 1382) +++ (revision ) @@ -1,367 +1,0 @@ -/* ------------------------------------------------------------------------- - * BKG NTRIP Client - * ------------------------------------------------------------------------- - * - * Class: bncSocket - * - * Purpose: Combines QTcpSocket (NTRIP v1) and QHttp (NTRIP v2) - * - * Author: L. Mervart - * - * Created: 27-Dec-2008 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include - -#include "bncsocket.h" -#include "bncapp.h" - -using namespace std; - -#define BNCVERSION "1.7" - -// Constructor -//////////////////////////////////////////////////////////////////////////// -bncSocket::bncSocket() { - bncApp* app = (bncApp*) qApp; - app->connect(this, SIGNAL(newMessage(QByteArray,bool)), - app, SLOT(slotMessage(const QByteArray,bool))); - _socket = 0; - _manager = 0; - _reply = 0; - _eventLoop = new QEventLoop(); - connect(this, SIGNAL(quitEventLoop()), _eventLoop, SLOT(quit())); -} - -// Destructor -//////////////////////////////////////////////////////////////////////////// -bncSocket::~bncSocket() { - delete _eventLoop; - delete _reply; - delete _manager; - delete _socket; -} - -// -//////////////////////////////////////////////////////////////////////////// -QAbstractSocket::SocketState bncSocket::state() const { - if (_manager) { - if (_reply) { - return QAbstractSocket::ConnectedState; - } - else { - return QAbstractSocket::UnconnectedState; - } - } - else if (_socket) { - return _socket->state(); - } - else { - return QAbstractSocket::UnconnectedState; - } -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::close() { - if (_socket) { - _socket->close(); - } -} - -// -//////////////////////////////////////////////////////////////////////////// -qint64 bncSocket::bytesAvailable() const { - if (_manager) { - return _buffer.size(); - } - else if (_socket) { - return _socket->bytesAvailable(); - } - else { - return 0; - } -} - -// -//////////////////////////////////////////////////////////////////////////// -bool bncSocket::canReadLine() const { - if (_manager) { - if (_buffer.indexOf('\n') != -1) { - return true; - } - else { - return false; - } - } - else if (_socket) { - return _socket->canReadLine(); - } - else { - return false; - } -} - -// -//////////////////////////////////////////////////////////////////////////// -QByteArray bncSocket::readLine() { - if (_manager) { - int ind = _buffer.indexOf('\n'); - if (ind != -1) { - QByteArray ret = _buffer.left(ind+1); - _buffer = _buffer.right(_buffer.size()-ind-1); - return ret; - } - else { - return ""; - } - } - else if (_socket) { - return _socket->readLine(); - } - else { - return ""; - } -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::waitForReadyRead(int msecs) { - if (_manager) { - if (bytesAvailable() > 0) { - return; - } - else { - _eventLoop->exec(QEventLoop::ExcludeUserInputEvents); - } - } - else if (_socket) { - _socket->waitForReadyRead(msecs); - } -} - -// -//////////////////////////////////////////////////////////////////////////// -QByteArray bncSocket::read(qint64 maxSize) { - if (_manager) { - QByteArray ret = _buffer.left(maxSize); - _buffer = _buffer.right(_buffer.size()-maxSize); - return ret; - } - else if (_socket) { - return _socket->read(maxSize); - } - else { - return ""; - } -} - -// Connect to Caster, send the Request -//////////////////////////////////////////////////////////////////////////// -t_irc bncSocket::request(const QUrl& mountPoint, const QByteArray& latitude, - const QByteArray& longitude, const QByteArray& nmea, - const QByteArray& ntripVersion, - int timeOut, QString& msg) { - - if (ntripVersion == "AUTO") { - emit newMessage("NTRIP Version AUTO not yet implemented", true); - return failure; - } - else if (ntripVersion == "2") { - return request2(mountPoint, latitude, longitude, nmea, timeOut, msg); - } - else if (ntripVersion != "1") { - emit newMessage("Unknown NTRIP Version " + ntripVersion, true); - return failure; - } - - delete _socket; - _socket = new QTcpSocket(); - - // Connect the Socket - // ------------------ - QSettings settings; - QString proxyHost = settings.value("proxyHost").toString(); - int proxyPort = settings.value("proxyPort").toInt(); - - if ( proxyHost.isEmpty() ) { - _socket->connectToHost(mountPoint.host(), mountPoint.port()); - } - else { - _socket->connectToHost(proxyHost, proxyPort); - } - if (!_socket->waitForConnected(timeOut)) { - msg += "Connect timeout\n"; - delete _socket; - _socket = 0; - return failure; - } - - // Send Request - // ------------ - QString uName = QUrl::fromPercentEncoding(mountPoint.userName().toAscii()); - QString passW = QUrl::fromPercentEncoding(mountPoint.password().toAscii()); - QByteArray userAndPwd; - - if(!uName.isEmpty() || !passW.isEmpty()) - { - userAndPwd = "Authorization: Basic " + (uName.toAscii() + ":" + - passW.toAscii()).toBase64() + "\r\n"; - } - - QUrl hlp; - hlp.setScheme("http"); - hlp.setHost(mountPoint.host()); - hlp.setPort(mountPoint.port()); - hlp.setPath(mountPoint.path()); - - QByteArray reqStr; - if ( proxyHost.isEmpty() ) { - if (hlp.path().indexOf("/") != 0) hlp.setPath("/"); - reqStr = "GET " + hlp.path().toAscii() + " HTTP/1.0\r\n" - + "User-Agent: NTRIP BNC/" BNCVERSION "\r\n" - + userAndPwd + "\r\n"; - } else { - reqStr = "GET " + hlp.toEncoded() + " HTTP/1.0\r\n" - + "User-Agent: NTRIP BNC/" BNCVERSION "\r\n" - + "Host: " + hlp.host().toAscii() + "\r\n" - + userAndPwd + "\r\n"; - } - - // NMEA string to handle VRS stream - // -------------------------------- - double lat, lon; - - lat = strtod(latitude,NULL); - lon = strtod(longitude,NULL); - - if ((nmea == "yes") && (hlp.path().length() > 2) && (hlp.path().indexOf(".skl") < 0)) { - const char* flagN="N"; - const char* flagE="E"; - if (lon >180.) {lon=(lon-360.)*(-1.); flagE="W";} - if ((lon < 0.) && (lon >= -180.)) {lon=lon*(-1.); flagE="W";} - if (lon < -180.) {lon=(lon+360.); flagE="E";} - if (lat < 0.) {lat=lat*(-1.); flagN="S";} - QTime ttime(QDateTime::currentDateTime().toUTC().time()); - int lat_deg = (int)lat; - double lat_min=(lat-lat_deg)*60.; - int lon_deg = (int)lon; - double lon_min=(lon-lon_deg)*60.; - int hh = 0 , mm = 0; - double ss = 0.0; - hh=ttime.hour(); - mm=ttime.minute(); - ss=(double)ttime.second()+0.001*ttime.msec(); - QString gga; - gga += "GPGGA,"; - gga += QString("%1%2%3,").arg((int)hh, 2, 10, QLatin1Char('0')).arg((int)mm, 2, 10, QLatin1Char('0')).arg((int)ss, 2, 10, QLatin1Char('0')); - gga += QString("%1%2,").arg((int)lat_deg,2, 10, QLatin1Char('0')).arg(lat_min, 7, 'f', 4, QLatin1Char('0')); - gga += flagN; - gga += QString(",%1%2,").arg((int)lon_deg,3, 10, QLatin1Char('0')).arg(lon_min, 7, 'f', 4, QLatin1Char('0')); - gga += flagE + QString(",1,05,1.00,+00100,M,10.000,M,,"); - int xori; - char XOR = 0; - char *Buff =gga.toAscii().data(); - int iLen = strlen(Buff); - for (xori = 0; xori < iLen; xori++) { - XOR ^= (char)Buff[xori]; - } - gga += QString("*%1").arg(XOR, 2, 16, QLatin1Char('0')); - reqStr += "$"; - reqStr += gga; - reqStr += "\r\n"; - } - - msg += reqStr; - - _socket->write(reqStr, reqStr.length()); - - if (!_socket->waitForBytesWritten(timeOut)) { - msg += "Write timeout\n"; - delete _socket; - _socket = 0; - return failure; - } - - return success; -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::slotReadyRead() { - _buffer.append(_reply->readAll()); - emit quitEventLoop(); -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::slotReplyFinished() { - emit quitEventLoop(); -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::slotError(QNetworkReply::NetworkError) { - emit newMessage("slotError " + _reply->errorString().toAscii(), true); -} - -// -//////////////////////////////////////////////////////////////////////////// -void bncSocket::slotSslErrors(const QList&) { - emit newMessage("slotSslErrors", true); -} - -// Connect to Caster NTRIP Version 2 -//////////////////////////////////////////////////////////////////////////// -t_irc bncSocket::request2(const QUrl& url, const QByteArray& latitude, - const QByteArray& longitude, const QByteArray& nmea, - int timeOut, QString& msg) { - - // 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 - // --------------- - 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.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&)), - this, SLOT(slotSslErrors(const QList&))); - - - return success; -} Index: trunk/BNC/bncsocket.h =================================================================== --- trunk/BNC/bncsocket.h (revision 1382) +++ (revision ) @@ -1,48 +1,0 @@ -#ifndef BNCSOCKET_H -#define BNCSOCKET_H - -#include -#include "bncconst.h" - -class bncSocket : public QObject { - Q_OBJECT - - public: - bncSocket(); - ~bncSocket(); - - void close(); - qint64 bytesAvailable() const; - bool canReadLine() const; - QByteArray readLine(); - void waitForReadyRead(int msecs = 30000); - QByteArray read(qint64 maxSize); - QAbstractSocket::SocketState state() const; - - t_irc request(const QUrl& mountPoint, const QByteArray& latitude, - const QByteArray& longitude, const QByteArray& nmea, - const QByteArray& ntripVersion, int timeOut, QString& msg); - - signals: - void quitEventLoop(); - void newMessage(QByteArray msg, bool showOnScreen); - - private slots: - void slotReplyFinished(); - void slotReadyRead(); - void slotError(QNetworkReply::NetworkError); - void slotSslErrors(const QList&); - - private: - t_irc request2(const QUrl& url, const QByteArray& latitude, - const QByteArray& longitude, const QByteArray& nmea, - int timeOut, QString& msg); - - QTcpSocket* _socket; - QNetworkAccessManager* _manager; - QNetworkReply* _reply; - QEventLoop* _eventLoop; - QByteArray _buffer; -}; - -#endif