diff options
| author | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
|---|---|---|
| committer | Fabian Schillinger | 2010-11-01 17:35:27 +0100 |
| commit | ea3fb17345e5f82db9f2e98a8062e95797700ace (patch) | |
| tree | 1da0d1a8ec9455364386af78762d0f6fed187824 /src/core | |
| parent | Process start/stop/view functionality (diff) | |
| parent | [PVSGUI] No X required for --help and --version (diff) | |
| download | pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.gz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.tar.xz pvs-ea3fb17345e5f82db9f2e98a8062e95797700ace.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
CMakeLists.txt
src/core/pvsConnectionManager.cpp
src/pvs.cpp
src/pvs.h
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/pvsClient.cpp | 1 | ||||
| -rw-r--r-- | src/core/pvsConnectionManager.cpp | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/core/pvsClient.cpp b/src/core/pvsClient.cpp index f048b54..0448f97 100644 --- a/src/core/pvsClient.cpp +++ b/src/core/pvsClient.cpp @@ -316,6 +316,5 @@ void PVSClient::processesVectorAdd(QString msg) else if (msg.indexOf("vector ready") == 0) { emit processVectorReady(true); - ConsoleLog writeError("processVectorReady(true)!"); } } diff --git a/src/core/pvsConnectionManager.cpp b/src/core/pvsConnectionManager.cpp index d0f1479..db302c4 100644 --- a/src/core/pvsConnectionManager.cpp +++ b/src/core/pvsConnectionManager.cpp @@ -260,6 +260,25 @@ void PVSConnectionManager::onCommand(PVSMsg command) else tmp->processesVectorAdd(message); } } + else if (ident == "MCASTFTANNOUNCE") + { + _pvsServer.sendToAll(command); + } + else if (ident == "MCASTFTRETRY") + { + QStringList fields = message.split(':'); + if (!fields.size() == 2) + { + qDebug() << "Malformed MCASTFTRETRY message:" << message; + return; + } + + PVSClient* client = getClientFromUsername(fields[0]); + if (client) + { + client->sendMessage(command); + } + } } void PVSConnectionManager::onChat(PVSMsg chatMsg) { |