From e8b8beead9e81f42f9c125d82ab6b21b60718f67 Mon Sep 17 00:00:00 2001 From: pk910 Date: Tue, 26 Jul 2011 09:24:04 +0200 Subject: [PATCH] continued burst() method & Numerics.class.php --- Uplink/Numerics.class.php | 84 ++++++++++++++++++++++++++++++++--- Uplink/P10Formatter.class.php | 1 + Uplink/P10_ModeSets.class.php | 4 ++ Uplink/P10_Server.class.php | 15 ++++++- Uplink/Uplink.class.php | 19 +++++++- 5 files changed, 115 insertions(+), 8 deletions(-) diff --git a/Uplink/Numerics.class.php b/Uplink/Numerics.class.php index 4727dcf..cb555fb 100644 --- a/Uplink/Numerics.class.php +++ b/Uplink/Numerics.class.php @@ -35,6 +35,9 @@ * * static String parseIP(String $numeric) * parses an IP Address in numeric format + * + * static String numericFromIP(String $ip) + * builds a numeric representing the IP */ class Numerics { @@ -81,7 +84,7 @@ class Numerics { return $int; } - public static function parseIP($numeric) { + public static function parseIP($numeric, $shortForm = true) { if(strlen($numeric) == 6) { //IPv4 $value = self::numToInt($numeric); $ip = array(); @@ -94,11 +97,16 @@ class Numerics { $ip = array(); for($i = 0; $i < strlen($numeric);) { if($numeric[$i] == "_") { - $rightBlocks = (strlen($numeric) - ($i + 1)) / 3; - $skipCount = 8 - count($ip) - $rightBlocks; - for($j = 0; $j < $skipBlocks; $j++) { - $ip[] = "0"; + 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); @@ -109,6 +117,72 @@ class Numerics { } } + 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; + foreach($ip as $i => $v) { + if($v == "") { + $skipBlocks = (8 - count($ip)); + for($j = 0; $j < $skipBlocks; $j++) { + $ipv6[$i+$j] = "_"; + } + $max_start = $i; + $biggest_zero_sequence = $skipBlocks; + } 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; + } + } + } + $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 diff --git a/Uplink/P10Formatter.class.php b/Uplink/P10Formatter.class.php index 73d620d..536d39d 100644 --- a/Uplink/P10Formatter.class.php +++ b/Uplink/P10Formatter.class.php @@ -39,6 +39,7 @@ class P10Formatter { "SERVER" => "SERVER %s 1 %s %s J10 %s]]] +s6 :%s", "ERROR" => "ERROR :%s", "Z" => "{num} Z %s", + "N" => "{num} N %s 1 %s %s %s %s %s %s :%s", null => null ); diff --git a/Uplink/P10_ModeSets.class.php b/Uplink/P10_ModeSets.class.php index 4d0af7d..52eed7d 100644 --- a/Uplink/P10_ModeSets.class.php +++ b/Uplink/P10_ModeSets.class.php @@ -36,6 +36,10 @@ class P10_UserModeSet { } + public getModeString() { + + } + } ?> \ No newline at end of file diff --git a/Uplink/P10_Server.class.php b/Uplink/P10_Server.class.php index 41bf281..f36bbea 100644 --- a/Uplink/P10_Server.class.php +++ b/Uplink/P10_Server.class.php @@ -55,7 +55,16 @@ * adds a Server to the server's "slave" list * * void delServer(P10_Server $server) - * removes a Server to the server's "slave" list + * removes a Server from the server's "slave" list + * + * void addUser(P10_User $user) + * adds a User to the server's userlist + * + * void delUser(P10_User $user) + * removes a User from the server's userlist + * + * P10_User[] getUsers() + * returns the server's userlist */ class P10_Server { @@ -152,6 +161,10 @@ class P10_Server { trigger_error("Tried to remove a User, that does NOT exist.", E_USER_WARNING); } } + + public function getUsers() { + return $this->users; + } } ?> \ No newline at end of file diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php index e7b8e9c..586f9f6 100644 --- a/Uplink/Uplink.class.php +++ b/Uplink/Uplink.class.php @@ -195,6 +195,9 @@ class Uplink { case "EB": $this->recv_end_of_burst($from, $arguments); break; + case "EA": + $this->recv_end_of_burst_ack($from, $arguments); + break; //default default: //unknown cmd @@ -262,7 +265,6 @@ class Uplink { } private function recv_nick($from, $args) { - //[recv] AM N Zer0n|IRPG 2 1292194168 ~Zer0n c04D8C5.localIP +oiwgrftx Zer0n Zer0n.admin.WebGamesNet AKBNjF AMAAj :Zer0n IRPG - Will never answer here. if(count($args) == 2) { //Nick change $user = P10_User::getUserByNum($from); @@ -302,13 +304,26 @@ class Uplink { } } - + private function recv_end_of_burst_ack($from, $args) { + //nothing to do here? + } /******************************************************************************************** * SERVER FUNCTIONS * ********************************************************************************************/ private function burst() { + foreach($this->server->getUsers() as $user) { + $nick = $user->getNick(); + $connect_time = $user->getConnectTime(); + $ident = $user->getIdent(); + $host = $user->getHost(); + $modes = $user->getModes()->getModeString(); + $ip = Numerics::numericFromIP($user->getIP()); + $numeric = $user->getNumeric(); + $realname = $user->getRealname(); + $this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname); + } $this->send("EB"); } -- 2.20.1