X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=b91bf8a993b99e8fa55cea3a5bdfa60fa4feda58;hb=7ee52d8a44c982d62baecf92cea6b266e8c2eb26;hp=586f9f665898821def007cda7c40928ec01cdde9;hpb=e8b8beead9e81f42f9c125d82ab6b21b60718f67;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 586f9f6..b91bf8a 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -46,16 +46,20 @@
  *
  * void setValidateServer(String $name, String $password)
  *     sets additional security relevant information about the remote server.
+ *
+ * void setEventHandler(EventHandler $event_handler)
+ *     sets the EventHandlder
  */
 require_once("Client.class.php");
 require_once("Numerics.class.php");
 require_once("P10Formatter.class.php");
 require_once("P10_Server.class.php");
 require_once("P10_User.class.php");
+require_once("P10_Channel.class.php");
 require_once("P10_ModeSets.class.php");
 
 class Uplink {
-	private $client = new Client();
+	private $client;
 	private $settings = array();
 	private $server;
 	
@@ -63,10 +67,13 @@ class Uplink {
 	const FLAG_SECURITY_QUIT   = 0x0002; //local connection abort because of security issues
 	const FLAG_NOT_CONNECTABLE = 0x0004; //remote server is not connectable
 	const FLAG_BURST_PENDING   = 0x0008; //we still have to burst
+	const FLAG_CONNECTED       = 0x0010; //connected and synced (ready)
+	const FLAG_GOT_PASS        = 0x0020; //got PASS from the remote Server
 	private $flags = 0;
 	
 	public function __construct() {
-		$this->setSettings("recv_timeout", 1000);
+		$this->client = new Client();
+		$this->setSetting("recv_timeout", 1000);
 	}
 	
 	public function initialize() {
@@ -104,7 +111,7 @@ class Uplink {
 			if(($this->flags & self::FLAG_SECURITY_QUIT) || ($this->flags & self::FLAG_NOT_CONNECTABLE)) {
 				sleep(1);
 			}
-			$state = $this->client->connect($host, $port, $this->getSettings("bind"), $this->getSettings("ssl"), $this->getSettings("recv_timeout"));
+			$state = $this->client->connect($host, $port, $this->getSetting("bind"), $this->getSetting("ssl"), $this->getSetting("recv_timeout"));
 			if(!$state) {
 				usleep($this->getSetting("recv_timeout") / 1000);
 				$this->flags |= self::FLAG_NOT_CONNECTABLE;
@@ -121,7 +128,7 @@ class Uplink {
 		}
 	}
 	
-	public function setUplink($host, $port, $ssl = false, $bind = null) {
+	public function setUplinkHost($host, $port, $ssl = false, $bind = null) {
 		$this->setSetting("host", $host);
 		$this->setSetting("port", $port);
 		$this->setSetting("ssl", $ssl);
@@ -198,6 +205,15 @@ class Uplink {
 			case "EA":
 				$this->recv_end_of_burst_ack($from, $arguments);
 				break;
+			case "SQ":
+				$this->recv_server_quit($from, $arguments);
+				break;
+			case "Q":
+				$this->recv_quit($from, $arguments);
+				break;
+			case "B":
+				$this->recv_burst($from, $arguments);
+				break;
 		//default
 			default:
 				//unknown cmd
@@ -209,6 +225,8 @@ class Uplink {
 		if(func_num_args() > 1) {
 			$args = array_slice(func_get_args(), 1);
 			$command = P10Formatter::formatCMD($this->getSetting("numeric"), $command, $args);
+		} else {
+			$command = P10Formatter::formatCMD($this->getSetting("numeric"), $command, array());
 		}
 		$this->client->send($command);
 	}
@@ -225,7 +243,9 @@ class Uplink {
 				$this->flags |= self::FLAG_SECURITY_QUIT;
 				$this->send("ERROR", "Incorrect password received.");
 				$this->client->disconnect();
+				return;
 			}
+			$this->flags |= self::FLAG_GOT_PASS;
 		}
 	}
 	
@@ -245,8 +265,14 @@ class Uplink {
 				$this->client->disconnect();
 				return;
 			}
+			if($this->getSetting("their_password") && !($this->flags & self::FLAG_GOT_PASS)) {
+				$this->flags |= self::FLAG_SECURITY_QUIT;
+				$this->send("ERROR", "PASS missing.");
+				$this->client->disconnect();
+				return;
+			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $this->server, $args[2], $args[3], $args[7]);
-			$this->server->add_server($new_server);
+			$this->server->addServer($new_server);
 			$this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
 		} else {
 			//another server got a new slave server ^^
@@ -256,7 +282,7 @@ class Uplink {
 				return;
 			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
-			$server->add_server($new_server);
+			$server->addServer($new_server);
 		}
 	}
 	
@@ -265,7 +291,7 @@ class Uplink {
 	}
 	
 	private function recv_nick($from, $args) {
-		if(count($args) == 2) {
+		if(count($args) <= 2) {
 			//Nick change
 			$user = P10_User::getUserByNum($from);
 			if($user == null) {
@@ -289,7 +315,7 @@ class Uplink {
 			$ident = $args[3];
 			$host = $args[4];
 			$modes = implode(" ",array_slice($args, 5, count($args)-8));
-			$modes = new UserModeSet($modes);
+			$modes = new P10_UserModeSet($modes);
 			$ip = Numerics::parseIP($args[count($args)-3]);
 			$realname = $args[count($args)-1];
 			new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);
@@ -305,7 +331,73 @@ class Uplink {
 	}
 	
 	private function recv_end_of_burst_ack($from, $args) {
-		//nothing to do here?
+		$this->flags |= self::FLAG_CONNECTED;
+	}
+	
+	private function recv_server_quit($from, $args) {
+		$server = P10_Server::getServerByName($args[0]);
+		if($server == null) {
+			trigger_error("Server (".$args[0].") not found.", E_USER_ERROR);
+			return;
+		}
+		$server->disconnectServer();
+	}
+	
+	private function recv_quit($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to quit an user that does not exist or was not found on recv_quit.", E_USER_ERROR);
+			return;
+		}
+		$user->quit($args[0]);
+	}
+	
+	private function recv_burst($from, $args) {
+		$name = $args[0];
+		$create_time = $args[1];
+		$channel = P10_Channel::getChannelByName($name);
+		if($channel == null)
+			$channel = new P10_Channel($name);
+		$modes = $channel->getModes();
+		$userstr = $args[count($args)-1];
+		$modeparamcount = count($args)-3;
+		if($userstr[0] == "%") {
+			//ban list
+			$banlist = explode(" ", substr($userstr, 1));
+			foreach($banlist as $ban) {
+				//TODO: save bans
+			}
+			$userstr = $args[count($args)-2];
+			$modeparamcount--;
+		}
+		if($userstr[0] == "+") { //MODE String
+			$modeparamcount++;
+			$userstr = "";
+		}
+		$users = explode(",",$userstr);
+		$isop = false; $isvoice = false;
+		foreach($users as $user) {
+			$uexp = explode(":", $user);
+			if(strlen($uexp[0]) != 5) {
+				trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR);
+				return;
+			}
+			if(count($uexp) > 1) {
+				$isop = false;
+				$isvoice = false;
+				for($i = 0; $i < strlen($uexp[1]); $i++) {
+					if($uexp[1][0] == "@") $isop = true;
+					if($uexp[1][0] == "+") $isvoice = true;
+				}
+			}
+			$user = P10_User::getUserByNum($uexp[0]);
+			if($user == null) {
+				trigger_error("burst parse error: cant find User '".$uexp[0]."'.", E_USER_ERROR);
+				return;
+			}
+			$channel->burstUser($user, $isop, $isvoice);
+		}
+		$modes->parseModes(implode(array_slice($args, 2, $modeparamcount)));
 	}
 	
 	/********************************************************************************************
@@ -324,6 +416,57 @@ class Uplink {
 			$realname = $user->getRealname();
 			$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
 		}
+		foreach(P10_Channel::getChannels() as $channel) {
+			$sorted_users = array('ov' => array(), 'o' => array(), 'v' => array(), '-' => array());
+			$local_users = false;
+			foreach($channel->getUsers() as $user) {
+				if(substr($user->getNumeric(), 0, 2) != $this->server->getNumeric()) continue; //skip users that are not on the local server
+				$privs = $channel->getUserPrivs($user);
+				$strPrivs = "";
+				if(($privs & P10_Channel::USERPRIV_OPED)) $strPrivs .= "o";
+				if(($privs & P10_Channel::USERPRIV_VOICE)) $strPrivs .= "v";
+				if($strPrivs == "") $strPrivs = "-";
+				$local_users = true;
+				$sorted_users[$strPrivs][] = $user;
+			}
+			if(!$local_users) continue;
+			$userStr = "";
+			foreach($sorted_users['-'] as $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+			}
+			foreach($sorted_users['ov'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":ov";
+			}
+			foreach($sorted_users['o'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":o";
+			}
+			foreach($sorted_users['v'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":v";
+			}
+			$banString = "";
+			//TODO: Build ban String
+			$burstString = "";
+			$modeString = $channel->getModes()->getModeString();
+			if($modeString != "+") {
+				$burstString .= $modeString;
+			}
+			if($userStr != "") {
+				if($burstString != "") $burstString .= " ";
+				$burstString .= $userStr;
+			}
+			if($banString != "") {
+				if($burstString != "") $burstString .= " ";
+				$burstString .= ":%".$banString;
+			}
+			$this->send("B", $channel->getName(), $channel->getCreateTime(), $burstString);
+		}
 		$this->send("EB");
 	}