github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get the final bridge systems setup. Seems to be functioning perfectly now.

Browse Source
This commit is contained in:
Ken Moore
2016-05-20 14:46:47 -04:00
parent 23c254e11e
commit 13fe684d78
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bridge/BridgeConnection.cpp
View File

@@ -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{

8
src/bridge/BridgeServer.cpp
View File

@@ -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; i<OpenSockets.length(); i++){
if(OpenSockets[i]->ID()==toID){ OpenSockets[i]->forwardMessage(msg); }
}
@@ -182,6 +183,7 @@ void BridgeServer::SslErrors(const QList<QSslError> &list){
// - More Functions for all socket interactions
void BridgeServer::SocketClosed(QString ID){
qDebug() << "Socket Closed:" << ID;
for(int i=0; i<OpenSockets.length(); i++){
if(OpenSockets[i]->ID()==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);