Changeset 209 for branches

Timestamp:

10/03/2009 02:40:08 PM (3 years ago)

Author:

Acinonyx

Message:

[awmn] Reuse deleted IP ranges

File:

• branches/awmn/includes/pages/mynodes/mynodes_range.php (modified) (4 diffs)

branches/awmn/includes/pages/mynodes/mynodes_range.php

@@ -4 +4 @@
  *
  * Copyright (C) 2005 Nikolaos Nikalexis <winner@cube.gr>
+ * Copyright (C) 2009 Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -28 +29 @@
         }
         
-        function calculate_next_range() {
+        function new_range() {
                 global $db;
                 $range = 256;
@@ -42 +43 @@
                                         INNER JOIN areas",
                                         "areas.ip_start <= ip_ranges.ip_start AND areas.ip_end >= ip_ranges.ip_end AND areas.id = '".$area_id."'", "" , "ip_end ASC");
-                
-                if (count($data) == 0) {
-                        $ret['ip_start'] = $area_ip_start;
-                        $ret['ip_end'] = $area_ip_start+$range-1;
-                } elseif ($data[count($data)-1]['ip_end']+$range <= $area_ip_end) {
-                        $ret['ip_start'] = $data[count($data)-1]['ip_end']+1;
-                        $ret['ip_end'] = $data[count($data)-1]['ip_end']+$range;
-                } else {
-                        for ($start = $area_ip_start; $start <= $area_ip_end; $start=$start+$range) {
-                                $end = $start+$range-1;
-                                $flag = TRUE;
-                                for($i=count($data)-1;$i>=0;$i--) {
-                                        if (($start >= $data[$i]['ip_start'] && $start <= $data[$i]['ip_end'])
-                                                || ($end >= $data[$i]['ip_start'] && $end <= $data[$i]['ip_end'])) {
-                                                $flag = FALSE;
-                                                break;
-                                        }
-                                }
-                                if ($flag) {
-                                        $ret['ip_start'] = $start;
-                                        $ret['ip_end'] = $end;
+
+                for ($start = $area_ip_start; $start < $area_ip_end; $start=$start+$range) {
+                        $end = $start+$range-1;
+                        $flag = TRUE;
+                        foreach ($data as $t_range) {
+                                if (($start >= $t_range['ip_start'] && $start <= $t_range['ip_end'])
+                                        || ($end >= $t_range['ip_start'] && $end <= $t_range['ip_end'])) {
+                                        $flag = FALSE;
                                         break;
                                 }
+                        }
+                        if ($flag) {
+                                $ret['ip_start'] = $start;
+                                $ret['ip_end'] = $end;
+                                break;
                         }
                 }
@@ -95 +88 @@
                 }
                 $form_getrange = $this->form_getrange();
-                $nextr = $this->calculate_next_range();
+                $nextr = $this->new_range();
                 $status = "waiting";
                 $ret = TRUE;