SOURCES: rtorrent-client_info.patch - updated for 0.6.1
charles
charles at pld-linux.org
Mon Aug 21 14:59:07 CEST 2006
Author: charles Date: Mon Aug 21 12:59:07 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 0.6.1
---- Files affected:
SOURCES:
rtorrent-client_info.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/rtorrent-client_info.patch
diff -u SOURCES/rtorrent-client_info.patch:1.1 SOURCES/rtorrent-client_info.patch:1.2
--- SOURCES/rtorrent-client_info.patch:1.1 Mon Jul 10 18:25:04 2006
+++ SOURCES/rtorrent-client_info.patch Mon Aug 21 14:59:02 2006
@@ -1,21 +1,51 @@
---- rtorrent-0.5.3/src/display/client_info.cc.orig 2006-05-04 16:12:24.000000000 +0200
-+++ rtorrent-0.5.3/src/display/client_info.cc 2006-07-08 14:38:15.961737000 +0200
-@@ -133,9 +133,14 @@
- client_info_equal(id + 1, sizeof_key(TYPE_AZUREUS)));
+--- rtorrent-0.6.1/src/display/client_info.cc.orig 2006-08-11 22:41:57.000000000 +0200
++++ rtorrent-0.6.1/src/display/client_info.cc 2006-08-20 16:30:05.887372250 +0200
+@@ -136,9 +136,14 @@
+ client_info_equal(id + 1, sizeof_key(TYPE_AZUREUS)));
if (itr != m_containers[TYPE_AZUREUS].end())
+- first = print_buffer(first, last, "%s %hhu.%hhu.%hhu.%hhu", itr->second,
+- rak::hexchar_to_value(id[3]), rak::hexchar_to_value(id[4]),
+- rak::hexchar_to_value(id[5]), rak::hexchar_to_value(id[6]));
+ {
+ if (id[1] == 'l' && id[2] == 't' && !std::strncmp(id+16, "UDP0", 4))
-+ first = print_buffer(first, last, "BitSpirit (spoofed ID)");
++ first = print_buffer(first, last, "BitSpirit (spoofed ID)");
+ else
- first = print_buffer(first, last, "%s %hhu.%hhu.%hhu.%hhu", itr->second,
- rak::hexchar_to_value(id[3]), rak::hexchar_to_value(id[4]),
- rak::hexchar_to_value(id[5]), rak::hexchar_to_value(id[6]));
++ first = print_buffer(first, last, "%s %hhu.%hhu.%hhu.%hhu", itr->second,
++ rak::hexchar_to_value(id[3]), rak::hexchar_to_value(id[4]),
++ rak::hexchar_to_value(id[5]), rak::hexchar_to_value(id[6]));
+ }
else
first = print_buffer(first, last, "unknown %c%c %hhu.%hhu.%hhu.%hhu", id[1], id[2],
-@@ -180,6 +185,26 @@
+@@ -160,16 +165,22 @@
+ first = print_buffer(first, last, "unknown %c %hhu.%hhu.%hhu", id[0],
+ rak::hexchar_to_value(id[1]), rak::hexchar_to_value(id[2]), rak::hexchar_to_value(id[3]));
+
+- } else if (std::isalpha(id[0]) && id[2] == '-' && id[4] == '-' && id[6] == '-' &&
+- std::isxdigit(id[1]) && std::isxdigit(id[3]) && std::isxdigit(id[5])) {
++ } else if (std::isalpha(id[0]) && id[2] == '-' && id[7] == '-' &&
++ std::isxdigit(id[1]) && std::isxdigit(id[3])) {
+ // TYPE_THREE_SPARSE.
+
+ const_iterator itr = std::find_if(m_containers[TYPE_MAINLINE].begin(), m_containers[TYPE_MAINLINE].end(),
+ client_info_equal(id, sizeof_key(TYPE_MAINLINE)));
+
+ if (itr != m_containers[TYPE_MAINLINE].end())
+- first = print_buffer(first, last, "%s %hhu.%hhu.%hhu", itr->second,
+- rak::hexchar_to_value(id[1]), rak::hexchar_to_value(id[3]), rak::hexchar_to_value(id[5]));
++ if (id[4] == '-')
++ first = print_buffer(first, last, "%s %hhu.%hhu.%hhu", itr->second,
++ rak::hexchar_to_value(id[1]), rak::hexchar_to_value(id[3]),
++ rak::hexchar_to_value(id[5]));
++ else
++ first = print_buffer(first, last, "%s %hhu.%hhu%hhu.%hhu", itr->second,
++ rak::hexchar_to_value(id[1]), rak::hexchar_to_value(id[3]),
++ rak::hexchar_to_value(id[4]), rak::hexchar_to_value(id[6]));
+
+ else
+ first = print_buffer(first, last, "unknown %c %hhu.%hhu.%hhu", id[0],
+@@ -183,6 +194,26 @@
// checks as they wouldn't be possible to remove/modify.
} else {
@@ -35,9 +65,9 @@
+ first = print_buffer(first, last, "eXeem");
+ } else if (std::strncmp(id+16, "UDP0", 4) == 0) {
+ first = print_buffer(first, last, "BitSpirit (cloaked)");
-+ } else if (std::strncmp(id+2, "Mbrst", 5) == 0) {
++ } else if (std::strncmp(id, "Mbrst", 5) == 0) {
+ first = print_buffer(first, last, "burst! %hhu.%hhu.%hhu",
-+ rak::hexchar_to_value(id[4]), rak::hexchar_to_value(id[6]), rak::hexchar_to_value(id[8]));
++ rak::hexchar_to_value(id[5]), rak::hexchar_to_value(id[7]), rak::hexchar_to_value(id[9]));
+ } else
first = print_buffer(first, last, "unknown");
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rtorrent-client_info.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list