[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/net/ip_set.ml

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/20 22:34:41

Modified files:
        distrib        : ChangeLog 
        src/utils/net  : ip_set.ml 

Log message:
        patch #5574

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1103&r2=1.1104
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/net/ip_set.ml?cvsroot=mldonkey&r1=1.30&r2=1.31

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1103
retrieving revision 1.1104
diff -u -b -r1.1103 -r1.1104
--- distrib/ChangeLog   19 Nov 2006 23:04:59 -0000      1.1103
+++ distrib/ChangeLog   20 Nov 2006 22:34:40 -0000      1.1104
@@ -15,6 +15,7 @@
 =========
 
 2006/11/20
+5574: allowed_ips: Fix list usage when 0.0.0.0/0 is part of the list (pango)
 5570: Some log messages in gettext module (Schlumpf)
 5569: HTML: Fix display bug in server list after js popups
       introduced by patch #5549 (Schlumpf)

Index: src/utils/net/ip_set.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/net/ip_set.ml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/utils/net/ip_set.ml     12 Nov 2006 12:36:14 -0000      1.30
+++ src/utils/net/ip_set.ml     20 Nov 2006 22:34:40 -0000      1.31
@@ -296,6 +296,7 @@
     end
 
 let of_list l =
+  bl_optimize (
   List.fold_left (fun acc r ->
     let range =
       match r with
@@ -314,7 +315,7 @@
          blocking_end = Ip.broadcast_address ip mask }
     in 
     add_range acc range
-  ) BL_Empty l
+  ) BL_Empty l)
 
 let print_list buf bl =
   let rec print_list_aux bl =