[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/04/03 20:35:05

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonBlocking.ml 

Log message:
        patch #5005

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.780&tr2=1.781&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonBlocking.ml.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.780 mldonkey/distrib/ChangeLog:1.781
--- mldonkey/distrib/ChangeLog:1.780    Sat Apr  1 23:20:55 2006
+++ mldonkey/distrib/ChangeLog  Mon Apr  3 20:35:05 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/04/03
+5005: CommonBlocking: Do not block IPs when GeoIP database is not loaded
+
 2006/04/02
 5003: BT: Improve client recognition (zet)
 5002: Overnet: Fix Out of Memory Exception (zet)
Index: mldonkey/src/daemon/common/commonBlocking.ml
diff -u mldonkey/src/daemon/common/commonBlocking.ml:1.1 
mldonkey/src/daemon/common/commonBlocking.ml:1.2
--- mldonkey/src/daemon/common/commonBlocking.ml:1.1    Wed Mar 29 15:41:33 2006
+++ mldonkey/src/daemon/common/commonBlocking.ml        Mon Apr  3 20:35:05 2006
@@ -38,8 +38,7 @@
 
 let geoip_hit cbl ip =
   let index = Geoip.get_country_code ip in
-  if not !Geoip.active then
-    Some "Geoip database not loaded yet"
+  if not !Geoip.active then None
   else if cbl.(index) then
     Some (Printf.sprintf "IPs from %s are currently blocked"
       Geoip.country_name_array.(index))