[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/... |
Date: |
Thu, 12 Apr 2007 11:32:50 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/04/12 11:32:50
Modified files:
distrib : ChangeLog
src/networks/donkey: donkeyInteractive.ml
Log message:
patch #5867
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1230&r2=1.1231
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyInteractive.ml?cvsroot=mldonkey&r1=1.151&r2=1.152
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -b -r1.1230 -r1.1231
--- distrib/ChangeLog 12 Apr 2007 10:03:37 -0000 1.1230
+++ distrib/ChangeLog 12 Apr 2007 11:32:50 -0000 1.1231
@@ -15,6 +15,7 @@
=========
2007/04/12
+5867: EDK: Show country code/flags for indirect clients
5862: BT: Informative GUI console messages after sending a .torrent file to GUI
5859: HTML: Support sending files from $MLDONKEY_DIR/html_themes/
Index: src/networks/donkey/donkeyInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyInteractive.ml,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -b -r1.151 -r1.152
--- src/networks/donkey/donkeyInteractive.ml 17 Mar 2007 18:03:01 -0000
1.151
+++ src/networks/donkey/donkeyInteractive.ml 12 Apr 2007 11:32:50 -0000
1.152
@@ -1185,9 +1185,12 @@
let get_ips_cc_cn c =
try
match c.client_kind with
- Direct_address (ip,port) ->
+ | Direct_address (ip,port) ->
let cc,cn = Geoip.get_country ip in
(Ip.to_string ip),cc,cn
+ | Indirect_address (_,_,_,_,real_ip) ->
+ let cc,cn = Geoip.get_country real_ip in
+ (Ip.to_string real_ip),cc,cn
| _ ->
let cc,cn = Geoip.unknown_country in
(string_of_client_addr c),cc,cn
- [Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/donkey/...,
mldonkey-commits <=