1 commit 9bb2bb4b480369184ac5ffb6202b85cbd63810d1
2 Author: Alexander V. Lukyanov <lav@yars.free.net>
3 Date: Fri May 23 18:35:01 2014 +0400
5 fixed a compile error and incorrect disconnect cause with unexpanded %s
7 diff --git a/src/Torrent.cc b/src/Torrent.cc
8 index 4eb1e4d..1ce4ea6 100644
11 @@ -2861,14 +2861,17 @@ int TorrentPeer::Do()
12 if(s==UNPACK_NO_DATA_YET)
14 if(s!=UNPACK_SUCCESS) {
16 if(s==UNPACK_PREMATURE_EOF) {
17 - if(recv_buf->Size()>0)
18 - LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
20 - LogError(4,dc=_("peer closed connection (before handshake)"));
21 + if(recv_buf->Size()>0) {
22 + LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
23 + Disconnect(_("peer unexpectedly closed connection"));
25 + LogError(4,_("peer closed connection (before handshake)"));
26 + Disconnect(_("peer closed connection (before handshake)"));
29 + Disconnect(_("invalid peer response format"));
34 if(!parent->HasMetadata() && !LTEPExtensionEnabled()) {
35 @@ -2976,12 +2979,13 @@ int TorrentPeer::Do()
37 if(st!=UNPACK_SUCCESS)
40 - if(st==UNPACK_PREMATURE_EOF)
41 - LogError(2,dc=_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
43 - LogError(2,dc=_("invalid peer response format"));
45 + if(st==UNPACK_PREMATURE_EOF) {
46 + LogError(2,_("peer unexpectedly closed connection after %s"),recv_buf->Dump());
47 + Disconnect(_("peer unexpectedly closed connection"));
49 + LogError(2,_("invalid peer response format"));
50 + Disconnect(_("invalid peer response format"));
54 reply->DropData(recv_buf);