Move network and input handling to separate threads.
Add some debugging output.
This commit is contained in:
parent
5e035a4448
commit
daf7213a05
|
@ -25,28 +25,40 @@ ConsoleReader::ConsoleReader ( std::vector<Socket*> *sockets_vector )
|
||||||
start();
|
start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConsoleReader::~ConsoleReader()
|
||||||
|
{
|
||||||
|
delete discoveryTimer;
|
||||||
|
}
|
||||||
|
|
||||||
void ConsoleReader::run()
|
void ConsoleReader::run()
|
||||||
{
|
{
|
||||||
char command;
|
QThread::sleep(1); // wait until sockets are discovered
|
||||||
|
for ( unsigned i = 0; i < sockets->size(); ++i )
|
||||||
|
{
|
||||||
|
connect((*sockets)[i], &Socket::stateChanged, this, &ConsoleReader::listSockets);
|
||||||
|
}
|
||||||
|
listSockets();
|
||||||
|
|
||||||
|
std::string command;
|
||||||
unsigned int number = 0;
|
unsigned int number = 0;
|
||||||
bool cont = true;
|
bool cont = true;
|
||||||
|
|
||||||
while ( cont )
|
while ( cont )
|
||||||
{
|
{
|
||||||
std::cin >> command;
|
std::cin >> command;
|
||||||
switch ( command )
|
switch ( command[0] )
|
||||||
{
|
{
|
||||||
case 'd':
|
case 'd':
|
||||||
( *sockets ) [number]->tableData();
|
(*sockets) [number]->tableData();
|
||||||
break;
|
break;
|
||||||
case 'n':
|
case 'n':
|
||||||
// std::cout << "Enter new name (max 16 characters)" << std::endl;
|
{
|
||||||
// string name;
|
command.erase(0,1);
|
||||||
// std::cin >> name;
|
(*sockets) [number]->changeSocketName(QString::fromStdString(command));
|
||||||
( *sockets ) [number]->changeSocketName();
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
case 'p':
|
case 'p':
|
||||||
( *sockets ) [number]->toggle();
|
(*sockets) [number]->toggle();
|
||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
cont = false;
|
cont = false;
|
||||||
|
@ -72,5 +84,5 @@ void ConsoleReader::listSockets()
|
||||||
std::cout << "Socket Name: " << (*i)->name.toStdString() << "\t Remote Password: " << (*i)->remotePassword.toStdString() << std::endl;
|
std::cout << "Socket Name: " << (*i)->name.toStdString() << "\t Remote Password: " << (*i)->remotePassword.toStdString() << std::endl;
|
||||||
}
|
}
|
||||||
std::cout << "___________________________________________________________________________\n" << std::endl;
|
std::cout << "___________________________________________________________________________\n" << std::endl;
|
||||||
std::cout << "d - update table data\nn - change socket name\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
|
std::cout << "d - update table data\nnName - change socket name to Name (max 16 characters)\ns - pick another socket (default is 1)\np - toggle power state\nq - quit" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,11 +27,13 @@ class ConsoleReader : public QThread
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ConsoleReader ( std::vector<Socket*> *sockets_vector );
|
ConsoleReader ( std::vector<Socket*> *sockets_vector );
|
||||||
void run ();
|
~ConsoleReader();
|
||||||
|
void run();
|
||||||
void listSockets();
|
void listSockets();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::vector<Socket*> *sockets;
|
std::vector<Socket*> *sockets;
|
||||||
|
QTimer *discoveryTimer;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* CONSOLEREADER_H */
|
#endif /* CONSOLEREADER_H */
|
||||||
|
|
9
main.cpp
9
main.cpp
|
@ -15,7 +15,6 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "consolereader.h"
|
#include "consolereader.h"
|
||||||
|
@ -28,13 +27,7 @@ int main(int argc, char *argv[])
|
||||||
std::vector<Socket*> *sockets = new std::vector<Socket*>;
|
std::vector<Socket*> *sockets = new std::vector<Socket*>;
|
||||||
Server server(sockets);
|
Server server(sockets);
|
||||||
ConsoleReader *reader = new ConsoleReader(sockets);
|
ConsoleReader *reader = new ConsoleReader(sockets);
|
||||||
QThread::sleep(2);
|
|
||||||
server.readPendingDatagrams();
|
|
||||||
|
|
||||||
for ( unsigned i = 0; i < sockets->size(); ++i )
|
|
||||||
{
|
|
||||||
QObject::connect((*sockets)[i], &Socket::stateChanged, reader, &ConsoleReader::listSockets);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
qWarning() << "event loop";
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
|
|
14
server.cpp
14
server.cpp
|
@ -15,7 +15,7 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
|
||||||
*************************************************************************/
|
*************************************************************************/
|
||||||
|
|
||||||
#include <algorithm>
|
#include <QUdpSocket>
|
||||||
|
|
||||||
#include "consolereader.h"
|
#include "consolereader.h"
|
||||||
#include "server.h"
|
#include "server.h"
|
||||||
|
@ -33,7 +33,9 @@ Server::Server ( std::vector<Socket*> *sockets_vector )
|
||||||
udpSocketSend->disconnectFromHost();
|
udpSocketSend->disconnectFromHost();
|
||||||
delete udpSocketSend;
|
delete udpSocketSend;
|
||||||
|
|
||||||
connect ( udpSocketGet, &QUdpSocket::readyRead, this, &Server::readPendingDatagrams );
|
connect ( udpSocketGet, &QUdpSocket::readyRead, this, &Server::readPendingDatagrams);
|
||||||
|
qWarning() << "starting server";
|
||||||
|
start();
|
||||||
}
|
}
|
||||||
|
|
||||||
Server::~Server()
|
Server::~Server()
|
||||||
|
@ -41,8 +43,14 @@ Server::~Server()
|
||||||
delete udpSocketGet;
|
delete udpSocketGet;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Server::run()
|
||||||
|
{
|
||||||
|
readPendingDatagrams();
|
||||||
|
}
|
||||||
|
|
||||||
void Server::readPendingDatagrams()
|
void Server::readPendingDatagrams()
|
||||||
{
|
{
|
||||||
|
// qWarning () << "reading datagam";
|
||||||
while ( udpSocketGet->hasPendingDatagrams() )
|
while ( udpSocketGet->hasPendingDatagrams() )
|
||||||
{
|
{
|
||||||
QByteArray reply;
|
QByteArray reply;
|
||||||
|
@ -67,12 +75,14 @@ void Server::readPendingDatagrams()
|
||||||
}
|
}
|
||||||
if ( !duplicate )
|
if ( !duplicate )
|
||||||
{
|
{
|
||||||
|
qWarning() << "Socket found";
|
||||||
Socket *socket = new Socket ( sender, reply );
|
Socket *socket = new Socket ( sender, reply );
|
||||||
sockets->push_back ( socket );
|
sockets->push_back ( socket );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
// qWarning() << "preparing to parse datagram";
|
||||||
QByteArray mac = reply.mid(6,6);
|
QByteArray mac = reply.mid(6,6);
|
||||||
for ( std::vector<Socket*>::iterator i = sockets->begin() ; i != sockets->end(); ++i )
|
for ( std::vector<Socket*>::iterator i = sockets->begin() ; i != sockets->end(); ++i )
|
||||||
{
|
{
|
||||||
|
|
7
server.h
7
server.h
|
@ -18,9 +18,13 @@
|
||||||
#ifndef SERVER_H
|
#ifndef SERVER_H
|
||||||
#define SERVER_H
|
#define SERVER_H
|
||||||
|
|
||||||
|
#include <QThread>
|
||||||
|
|
||||||
#include "socket.h"
|
#include "socket.h"
|
||||||
|
|
||||||
class Server : public QObject
|
class QUdpSocket;
|
||||||
|
|
||||||
|
class Server : public QThread
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Server ( std::vector<Socket*> *sockets_vector );
|
Server ( std::vector<Socket*> *sockets_vector );
|
||||||
|
@ -28,6 +32,7 @@ public:
|
||||||
|
|
||||||
void discoverSockets ();
|
void discoverSockets ();
|
||||||
void readPendingDatagrams();
|
void readPendingDatagrams();
|
||||||
|
void run();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QByteArray discover = QByteArray::fromHex ( "68 64 00 06 71 61" );
|
QByteArray discover = QByteArray::fromHex ( "68 64 00 06 71 61" );
|
||||||
|
|
43
socket.cpp
43
socket.cpp
File diff suppressed because one or more lines are too long
10
socket.h
10
socket.h
|
@ -21,7 +21,8 @@
|
||||||
#include <QByteArray>
|
#include <QByteArray>
|
||||||
#include <QHostAddress>
|
#include <QHostAddress>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
#include <QUdpSocket>
|
|
||||||
|
class QUdpSocket;
|
||||||
|
|
||||||
const QByteArray magicKey = QByteArray::fromHex ( "68 64" ); // recognize datagrams from the socket
|
const QByteArray magicKey = QByteArray::fromHex ( "68 64" ); // recognize datagrams from the socket
|
||||||
|
|
||||||
|
@ -37,13 +38,13 @@ public:
|
||||||
~Socket();
|
~Socket();
|
||||||
void toggle();
|
void toggle();
|
||||||
void tableData();
|
void tableData();
|
||||||
void changeSocketName ( /*QString name*/ );
|
void changeSocketName ( QString newName );
|
||||||
bool parseReply ( QByteArray );
|
bool parseReply ( QByteArray );
|
||||||
|
|
||||||
QHostAddress ip, localIP;
|
QHostAddress ip, localIP;
|
||||||
QByteArray mac;
|
QByteArray mac;
|
||||||
bool powered;
|
bool powered;
|
||||||
QString name, remotePassword;
|
QByteArray name, remotePassword;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
enum Datagram {Subscribe, PowerOff, PowerOn, TableData, SocketData, TimingData, WriteSocketData, MaxCommands};
|
enum Datagram {Subscribe, PowerOff, PowerOn, TableData, SocketData, TimingData, WriteSocketData, MaxCommands};
|
||||||
|
@ -55,6 +56,7 @@ private:
|
||||||
QByteArray commandID[MaxCommands];
|
QByteArray commandID[MaxCommands];
|
||||||
QByteArray datagram[MaxCommands];
|
QByteArray datagram[MaxCommands];
|
||||||
QByteArray rmac; // Reveresed mac
|
QByteArray rmac; // Reveresed mac
|
||||||
|
QByteArray versionID;
|
||||||
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion;
|
QByteArray socketTableNumber, socketTableVersion, timingTableNumber, timingTableVersion;
|
||||||
|
|
||||||
const QByteArray twenties = QByteArray::fromHex ( "20 20 20 20 20 20" ); // mac address padding
|
const QByteArray twenties = QByteArray::fromHex ( "20 20 20 20 20 20" ); // mac address padding
|
||||||
|
@ -63,8 +65,8 @@ private:
|
||||||
const QByteArray one = QByteArray::fromHex ( "01" );
|
const QByteArray one = QByteArray::fromHex ( "01" );
|
||||||
|
|
||||||
QUdpSocket *udpSocket;
|
QUdpSocket *udpSocket;
|
||||||
|
|
||||||
QTimer *subscribeTimer;
|
QTimer *subscribeTimer;
|
||||||
|
bool subscribed;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue