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

Clean up the server and bridge systems so that connections are now successful as needed.

Browse Source
This commit is contained in:
Ken Moore
2016-05-20 12:40:32 -04:00
parent 6e07eb7c49
commit d8a0faea79
6 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bridge/BridgeServer.cpp
View File

@@ -113,11 +113,13 @@ QString BridgeServer::generateID(QString name){
// New Connection Signals
void BridgeServer::NewSocketConnection(){
BridgeConnection *sock = 0;
qDebug() << "New incoming connection..";
if(this->hasPendingConnections()){
qDebug() << "New incoming connection..";
QWebSocket *ws = this->nextPendingConnection();
if(allowConnection(ws->peerAddress()) ){
sock = new BridgeConnection( ws, generateID(ws->peerName()) );
QString name = ws->peerName();
if(name.isEmpty()){ name = ws->peerAddress().toString(); }
sock = new BridgeConnection( ws, generateID(name) );
}else{
ws->abort();
}
@@ -125,7 +127,7 @@ void BridgeServer::NewSocketConnection(){
if(sock==0){ return; } //no new connection
//qDebug() << "New Socket Connection";
connect(sock, SIGNAL(SocketClosed(QString)), this, SLOT(SocketClosed(QString)) );
connect(sock, SIGNAL(SocketMessage(QString, QString)), this, SLOT(SendMessage(QString, QString)) );
connect(sock, SIGNAL(SocketMessage(QString, QString)), this, SLOT(sendMessage(QString, QString)) );
connect(sock, SIGNAL(keysChanged(QString, bool, QStringList)), this, SLOT(announceKeyChange(QString, bool, QStringList)) );
OpenSockets << sock;
}
@@ -188,6 +190,7 @@ void BridgeServer::SocketClosed(QString ID){
// Connection Keys Changed
void BridgeServer::announceKeyChange(QString ID, bool isServer, QStringList keys){
qDebug() << "Key Change:" << ID << isServer << keys;
for(int c = 0; c<OpenSockets.length(); c++){
bool server = OpenSockets[c]->isServer();
QStringList keys = OpenSockets[c]->validKeySums();
@@ -199,6 +202,7 @@ void BridgeServer::announceKeyChange(QString ID, bool isServer, QStringList keys
//compare keys to look for matches
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(); }
}