← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcplusplus/trunk] Rev 2331: Send "000" as the STA success code

 

------------------------------------------------------------
revno: 2331
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2010-12-05 19:59:52 +0100
message:
  Send "000" as the STA success code
modified:
  changelog.txt
  dcpp/AdcCommand.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription
=== modified file 'changelog.txt'
--- changelog.txt	2010-12-05 17:03:00 +0000
+++ changelog.txt	2010-12-05 18:59:52 +0000
@@ -50,6 +50,7 @@
 * Repurpose passive user icons to mean "no free slot" (when INF FS is available) (poy)
 * [L#534242] Better looking settings dialog (fleetcommand, poy)
 * Allow regular expressions in ADL searches (poy)
+* [L#395464] [ADC] Send "000" as the STA success code
 
 -- 0.770 2010-07-05 --
 * [L#550300] Catch more potential file corruptions (thanks bigmuscle)

=== modified file 'dcpp/AdcCommand.cpp'
--- dcpp/AdcCommand.cpp	2010-02-11 21:44:13 +0000
+++ dcpp/AdcCommand.cpp	2010-12-05 18:59:52 +0000
@@ -27,7 +27,7 @@
 AdcCommand::AdcCommand(uint32_t aCmd, char aType /* = TYPE_CLIENT */) : cmdInt(aCmd), from(0), type(aType) { }
 AdcCommand::AdcCommand(uint32_t aCmd, const uint32_t aTarget, char aType) : cmdInt(aCmd), from(0), to(aTarget), type(aType) { }
 AdcCommand::AdcCommand(Severity sev, Error err, const string& desc, char aType /* = TYPE_CLIENT */) : cmdInt(CMD_STA), from(0), type(aType) {
-	addParam(Util::toString(sev * 100 + err));
+	addParam((sev == SEV_SUCCESS) ? "000" : Util::toString(sev * 100 + err));
 	addParam(desc);
 }