From 13fe684d78b3948d81d8944a9656a42439760e1f Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Fri, 20 May 2016 14:46:47 -0400 Subject: [PATCH] Get the final bridge systems setup. Seems to be functioning perfectly now. --- src/bridge/BridgeConnection.cpp | 2 +- src/bridge/BridgeServer.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bridge/BridgeConnection.cpp b/src/bridge/BridgeConnection.cpp index 4c75ce0..428678e 100644 --- a/src/bridge/BridgeConnection.cpp +++ b/src/bridge/BridgeConnection.cpp @@ -87,7 +87,7 @@ QStringList BridgeConnection::JsonArrayToStringList(QJsonArray array){ void BridgeConnection::InjectMessage(QString msg){ //See if this message is directed to the bridge itself, or a client - qDebug() << "Got Message:" << msg; + //qDebug() << "Got Message:" << msg; if(msg.startsWith("{") || !AUTHSYSTEM->checkAuth(SockAuthToken) ){ HandleAPIMessage(msg); }else{ diff --git a/src/bridge/BridgeServer.cpp b/src/bridge/BridgeServer.cpp index 1f750dc..1289a2e 100644 --- a/src/bridge/BridgeServer.cpp +++ b/src/bridge/BridgeServer.cpp @@ -41,6 +41,7 @@ bool BridgeServer::startServer(quint16 port){ // PUBLIC SLOTS //=================== void BridgeServer::sendMessage(QString toID, QString msg){ + //qDebug() << "Try to forward message:" << toID; for(int i=0; iID()==toID){ OpenSockets[i]->forwardMessage(msg); } } @@ -182,6 +183,7 @@ void BridgeServer::SslErrors(const QList &list){ // - More Functions for all socket interactions void BridgeServer::SocketClosed(QString ID){ + qDebug() << "Socket Closed:" << ID; for(int i=0; iID()==ID){ delete OpenSockets.takeAt(i); break; } } @@ -200,11 +202,13 @@ void BridgeServer::announceKeyChange(QString ID, bool isServer, QStringList keys if(i==c){ continue; } //current socket else if(OpenSockets[i]->isServer() != server){ //look for a server/client pair //compare keys to look for matches - QStringList chkkeys = OpenSockets[i ]->validKeySums(); + /*QStringList chkkeys = OpenSockets[i ]->validKeySums(); chkkeys.removeDuplicates(); qDebug() << "Known Keys for ID:" << OpenSockets[i]->ID() << chkkeys; chkkeys << keys; - if(chkkeys.removeDuplicates() > 0){ IDs << OpenSockets[i]->ID(); } + if(chkkeys.removeDuplicates() > 0){ */ + IDs << OpenSockets[i]->ID(); + //} } }//end inner loop of sockets OpenSockets[c]->announceIDAvailability(IDs);