Add source and status fields

Author: mlazdans

lib/CountryRange.php

@@ -5,8 +5,8 @@
 class CountryRange extends Range {
 	var string $iso;
 
-	function __construct(string $iso, int $start, int $end, int $merges = 0){
-		parent::__construct($start, $end, $merges);
+	function __construct(string $iso, int $start, int $end, int $merges, int $source, int $status){
+		parent::__construct($start, $end, $merges, $source, $status);
 		$this->iso = $iso;
 	}
 

lib/CountryRangeDB.php

@@ -6,16 +6,16 @@ class CountryRangeDB extends RangeDB {
 	protected function addLine(string $line){
 		$parts = preg_split('/[,\s]/', trim($line));
 
-		list($iso, $start, $end, $merges) = $parts;
+		list($iso, $start, $end, $merges, $source, $status) = $parts;
 
-		$r = new CountryRange($iso, (int)$start, (int)$end, (int)$merges);
+		$r = new CountryRange($iso, (int)$start, (int)$end, (int)$merges, (int)$source, (int)$status);
 
 		$this->addRecord($r);
 	}
 
 	function copyFrom(RangeDB $db){
 		foreach($db->ranges as $Range){
-			$r = new CountryRange($db->name, $Range->start, $Range->end, $Range->merges);
+			$r = new CountryRange($db->name, $Range->start, $Range->end, $Range->merges, $Range->source, $Range->status);
 			$this->addRecord($r);
 		}
 	}

lib/ProcessDelegated.php

@@ -34,9 +34,16 @@ public function run(): CountryRangeDB {
 			$ipStart = ip2long($parts[3]);
 			$ipCount = (int)$parts[4];
 			$ipEnd = $ipStart + $ipCount - 1;
-			// $data[] = "$country,$ipStart,$ipEnd";
-			// $data[] = new CountryRange($country, $ipStart, $ipEnd);
-			$data->addRecord(new CountryRange($country, $ipStart, $ipEnd));
+
+			$s = $parts[6];
+			if($s == 'assigned')
+				$status = Range::STATUS_ASSIGNED;
+			elseif($s == 'allocated')
+				$status = Range::STATUS_ALLOCATED;
+			else
+				$status = 0;
+
+			$data->addRecord(new CountryRange($country, $ipStart, $ipEnd, 0, Range::SOURCE_STATS, $status));
 		}
 		proc_close($r);
 

lib/ProcessWhois.php

@@ -112,9 +112,20 @@ function save_state($record){
 		if(!($c = country_rule($country)))
 			return;
 
-		// $this->data[] = "$c,$ip_start_long,$ip_end_long";
-		// $this->data[] = new CountryRange($c, $ip_start_long, $ip_end_long);
-		$this->data->addRecord(new CountryRange($c, $ip_start_long, $ip_end_long));
+		$status = 0;
+		if(isset($record['status'])){
+			$s = strtoupper($record['status']);
+			if($s == 'REASSIGNED')
+				$status = Range::STATUS_REASSIGNED;
+			elseif($s == 'REALLOCATED')
+				$status = Range::STATUS_REALLOCATED;
+			elseif(preg_match("/ASSIGNED/", $s))
+				$status = Range::STATUS_ASSIGNED;
+			elseif(preg_match("/ALLOCATED/", $s))
+				$status = Range::STATUS_ALLOCATED;
+		}
+
+		$this->data->addRecord(new CountryRange($c, $ip_start_long, $ip_end_long, 0, Range::SOURCE_INETNUM, $status));
 
 		return true;
 	}

lib/Range.php

@@ -3,20 +3,32 @@
 declare(strict_types = 1);
 
 class Range {
+	const STATUS_ALLOCATED       = 1;
+	const STATUS_ASSIGNED        = 2;
+	const STATUS_REALLOCATED     = 3;
+	const STATUS_REASSIGNED      = 4;
+
+	const SOURCE_INETNUM         = 1;
+	const SOURCE_STATS           = 2;
+
 	var int $start;
 	var int $end;
 	var int $interval;
-	var int $merges = 0;
+	var int $merges;
+	var int $status;
+	var int $source;
 
-	function __construct(int $start, int $end, int $merges = 0) {
+	function __construct(int $start, int $end, int $merges, int $source, int $status) {
 		$this->start = $start;
 		$this->end = $end;
 		$this->merges = $merges;
+		$this->source = $source;
+		$this->status = $status;
 		$this->interval = $this->end - $this->start;
 	}
 
 	function __toString() {
-		return "$this->start,$this->end,$this->merges";
+		return "$this->start,$this->end,$this->merges,$this->source,$this->status";
 	}
 
 	function isWithin(Range $r) {

lib/RangeDB.php

@@ -19,9 +19,9 @@ function __toString() {
 
 	protected function addLine(string $line){
 		$parts = preg_split('/[,\s]/', trim($line));
-		list($start, $end, $merges) = $parts;
+		list($start, $end, $merges, $source, $status) = $parts;
 
-		$r = new Range((int)$start, (int)$end, (int)$merges);
+		$r = new Range((int)$start, (int)$end, (int)$merges, (int)$source, (int)$status);
 
 		$this->addRecord($r);
 	}