X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FNumerics.class.php;h=01944dcb9aa6d42776c97e38593287fcc10fefb0;hb=f1a1066826a5cc04606cc12f0bd0b8e0383ca190;hp=7b6bee116e219da74223c50deb4d5ff1f215d480;hpb=74fcc85514c9bd0a4a8dfbd909d9555a9f1ee5b8;p=PHP-P10.git

diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php
index 7b6bee1..01944dc 100644
--- a/Uplink/Numerics.class.php
+++ b/Uplink/Numerics.class.php
@@ -84,117 +84,6 @@ class Numerics {
 		return $int;
 	}
 	
-	public static function parseIP($numeric, $shortForm = true) {
-		if(strlen($numeric) == 6) { //IPv4
-			$value = self::numToInt($numeric);
-			$ip = array();
-			$ip[0] = ($value & 0xff000000) >> 24;
-			$ip[1] = ($value & 0x00ff0000) >> 16;
-			$ip[2] = ($value & 0x0000ff00) >> 8;
-			$ip[3] = ($value & 0x000000ff);
-			return implode(".", $ip);
-		} else { //IPv6
-			$ip = array();
-			for($i = 0; $i < strlen($numeric);) {
-				if($numeric[$i] == "_") {
-					if($shortForm) {
-						$ip[] = ""; //::
-					} else {
-						$rightBlocks = (strlen($numeric) - ($i + 1)) / 3;
-						$skipCount = 8 - count($ip) - $rightBlocks;
-						for($j = 0; $j < $skipBlocks; $j++) {
-							$ip[] = "0";
-						}
-					}
-					$i++;
-				} else {
-					$value = self::numToInt($numeric[$i].$numeric[$i+1].$numeric[$i+2]);
-					$ip[] = dechex($value);
-					$i += 3;
-				}
-			}
-			return implode(":", $ip);
-		}
-	}
-	
-	public static function numericFromIP($ip) {
-		$pattern = array();
-		$pattern['ipv6'] = '/^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))(|\/[0-9]{1,3})$/';
-		$pattern['ipv4'] = '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(|\/[0-9]{1,2})$/';
-		if(preg_match($pattern['ipv4'], $ip)) {
-			//thats quite simple here
-			$ip = explode(".", $ip);
-			$ipValue = intval($ip[3]);
-			$ipValue <<= 8;
-			$ipValue |= intval($ip[2]);
-			$ipValue <<= 8;
-			$ipValue |= intval($ip[1]);
-			$ipValue <<= 8;
-			$ipValue |= intval($ip[0]);
-			$ip = self::intToNum($ipValue,6);
-		} else if(preg_match($pattern['ipv6'], $ip)) {
-			//thats a little bit complicated :D (we may only have one _)
-			$ipv6 = array();
-			$ip = explode(":",$ip);
-			$last_zero = false; $zero_sequence = 0; $biggest_zero_sequence = 0; $max_start = -1;
-			$i = 0;
-			foreach($ip as $v) {
-				if($v == "") {
-					$skipBlocks = (8 - count($ip));
-					for($j = 0; $j < $skipBlocks; $j++) {
-						$ipv6[$i+$j] = "_";
-					}
-					$max_start = $i;
-					if($last_zero) {
-						$zero_sequence += $skipBlocks;
-					} else {
-						$last_zero = true;
-						$zero_sequence = $skipBlocks;
-					}
-					$i+=$skipBlocks;
-					if($zero_sequence > $biggest_zero_sequence) {
-						$biggest_zero_sequence = $zero_sequence;
-						$max_start = $i-($zero_sequence-1);
-					}
-				} else {
-					$value = hexdec($v);
-					if($value == 0) {
-						$ipv6[$i] = "_";
-						if($last_zero) {
-							$zero_sequence++;
-						} else {
-							$last_zero = true;
-							$zero_sequence = 1;
-						}
-						if($zero_sequence > $biggest_zero_sequence) {
-							$biggest_zero_sequence = $zero_sequence;
-							$max_start = $i-($zero_sequence-1);
-						}
-					} else {
-						$ipv6[$i] = self::intToNum($value,3);
-						$last_zero = false;
-					}
-					$i++;
-				}
-			}
-			$ip = "";
-			for($i = 0; $i < 8; $i++) {
-				if($i == $max_start) { //merge the biggest sequence of _'s
-					$ip .= "_";
-					$i += ($biggest_zero_sequence-1);
-				} elseif($ipv6[$i] == "_") {
-					$ip .= "AAA";
-				} else {
-					$ip .= $ipv6[$i];
-				}
-			}
-			return $ip;
-		} else {
-			$ip = "AAAAAA";
-		}
-		return $ip;
-	}
-	
 }
 
 ?>
\ No newline at end of file