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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/09/01 07:19:03

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

Log message:
        patch #6628

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1381&r2=1.1382
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonGlobals.ml?cvsroot=mldonkey&r1=1.88&r2=1.89

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1381
retrieving revision 1.1382
diff -u -b -r1.1381 -r1.1382
--- distrib/ChangeLog   4 Aug 2008 19:39:12 -0000       1.1381
+++ distrib/ChangeLog   1 Sep 2008 07:19:02 -0000       1.1382
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2009/09/01
+6628: IP discover: Use http://whatismyip.org, old URL is not working anymore
+-------------------------------------------------------------------------------
 2008/08/04: version 2.9.6 = tag release-2-9-6
 6599: Allow values lower than max_upload_slots for BT-max_bt_uploaders
 

Index: src/daemon/common/commonGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonGlobals.ml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- src/daemon/common/commonGlobals.ml  20 Oct 2007 20:02:13 -0000      1.88
+++ src/daemon/common/commonGlobals.ml  1 Sep 2008 07:19:03 -0000       1.89
@@ -857,7 +857,7 @@
       if !verbose then lprintf_nl "started IP discovery";
       let module H = Http_client in
       let r = { H.basic_request with
-        H.req_url = Url.of_string "http://ip.discoveryvip.com/ip.asp";;
+        H.req_url = Url.of_string "http://whatismyip.org/";;
         H.req_proxy = !CommonOptions.http_proxy;
         H.req_max_retry = 10;
         H.req_user_agent = get_user_agent () }
@@ -868,13 +868,10 @@
           try
             while true do
               let line = input_line cin in
-              let search_string = "Your Ip address is  " in
                 try
-                  if Str.string_match (Str.regexp ("^" ^ search_string)) line 
0 then
+                  let ip = Ip.of_string line in
                     begin
-                      set_client_ip =:=
-                        Ip.of_string (String.sub line (String.length 
search_string)
-                          ((String.length line) - (String.length 
search_string)));
+                    set_client_ip =:= ip;
                       last_high_id := !!set_client_ip;
                       if !verbose then lprintf_nl "discovered IP %s" 
(Ip.to_string !!set_client_ip)
                     end