summaryrefslogtreecommitdiffstats
path: root/src/net/pvsOutgoingMulticastTransfer.cpp
diff options
context:
space:
mode:
authorSebastien Braun2010-10-03 16:14:44 +0200
committerSebastien Braun2010-10-03 16:14:44 +0200
commitffee0868ef1341cfb7622821431cb73c52590962 (patch)
treebc96be65e0346ea25a8effb2118de59b08d54466 /src/net/pvsOutgoingMulticastTransfer.cpp
parentAdd patch for OpenPGM to fix switch() fallthrough (diff)
downloadpvs-ffee0868ef1341cfb7622821431cb73c52590962.tar.gz
pvs-ffee0868ef1341cfb7622821431cb73c52590962.tar.xz
pvs-ffee0868ef1341cfb7622821431cb73c52590962.zip
Assorted Multicast Fixes:
- Upgrade bundled OpenPGM to SVN r1135 - Timing fixes: Make all rate-limited and timer-pending operation wait for at least 1ms to avoid busy-waiting - No distinction between sending and receiving sockets when setting up socket options (Receivers need to be able to send anyway when using PGMCC). - Switch from fixed-rate transmission to using PGMCC for congestion control. - Remove some obnoxious debugging outputs - Some white space fixes - Introduce a short waiting time before actually starting file transmission in order to allow enough SPM messages to be sent so that receivers can initialize properly. - Fix MCASTFTANNOUNCE message to include full file name instead of basename. - Fix generateMcastTransferID in order to gather more random IDs. PVSGUI may become confused if transfer IDs are reused. - Properly dispose of clientFileReceiveDialog when multicast transfer is finished. - Properly display transfer size in clientFileReceiveDialog
Diffstat (limited to 'src/net/pvsOutgoingMulticastTransfer.cpp')
-rw-r--r--src/net/pvsOutgoingMulticastTransfer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/pvsOutgoingMulticastTransfer.cpp b/src/net/pvsOutgoingMulticastTransfer.cpp
index 2f24d49..4df4986 100644
--- a/src/net/pvsOutgoingMulticastTransfer.cpp
+++ b/src/net/pvsOutgoingMulticastTransfer.cpp
@@ -121,7 +121,7 @@ void PVSOutgoingMulticastTransfer::prepare()
_socketInacceptable = false;
// announce the transfer:
QFileInfo info(*_file);
- QString message = QString("%1:%2:%3:%4:%5").arg(_senderName).arg(_id).arg(info.baseName()).arg(info.size()).arg(_config->multicastUDPPortBase());
+ QString message = QString("%1:%2:%3:%4:%5").arg(_senderName).arg(_id).arg(info.fileName()).arg(info.size()).arg(_config->multicastUDPPortBase());
PVSMsg msg(PVSCOMMAND, "MCASTFTANNOUNCE", message);
emit announce(msg);
_prepareTimer->start(5000);