added P10_Server.class.php & recv_server
authorpk910 <philipp@zoelle1.de>
Tue, 26 Jul 2011 04:42:18 +0000 (06:42 +0200)
committerpk910 <philipp@zoelle1.de>
Tue, 26 Jul 2011 04:42:18 +0000 (06:42 +0200)
Uplink/P10_Server.class.php [new file with mode: 0644]
Uplink/Uplink.class.php
main.php

diff --git a/Uplink/P10_Server.class.php b/Uplink/P10_Server.class.php
new file mode 100644 (file)
index 0000000..a2144cb
--- /dev/null
@@ -0,0 +1,113 @@
+<?php
+/********************************* PHP-P10 ******************************
+ *    P10 uplink class by pk910   (c)2011 pk910                         *
+ ************************************************************************
+ *                          Version 2 (OOP)                             *
+ *                                                                      *
+ * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation; either version 2 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with PHP-P10; if not, write to the Free Software Foundation,   *
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ *                                                                      *
+ ************************************************************************
+ * 
+ *  Uplink/P10_Server.class.php
+ *
+ * This class represents a IRC Server
+ *
+ ************************************************************************
+ * accessable methods:
+ *
+ * static P10_Server getServerByNum(String $numeric) 
+ *     searches and returns the Server with the provided Numeric
+ *
+ * __construct(String $name, String $numeric, P10_Server $parent_server, int $start_time, $link_time, $description)
+ *     *** nothing to say here ***
+ *
+ * void disconnectServer(bool $linked_only = false)
+ *     DISCONNECT EVENT (if $linked_only is true, only the Servers connected to the actual Server get disconnected.)
+ *
+ * String getNumeric()
+ *     returns the Numeric of the Server
+ *
+ * void addServer(P10_Server $server)
+ *     adds a Server to the server's "slave" list
+ *
+ * void delServer(P10_Server $server)
+ *     removes a Server to the server's "slave" list
+ */
+
+class P10_Server {
+       private static $static_servers = array();
+       
+       public static getServerByNum($numeric) {
+               if(array_key_exists($numeric, self::$static_servers)) {
+                       return self::$static_servers[$numeric];
+               }
+               return NULL;
+       }
+       
+       
+       private $name;
+       private $numeric;
+       private $parent_server;
+       private $start_time;
+       private $link_time;
+       private $description;
+       private $servers = array(); //all Servers connected to this Server
+       
+       public function __construct($name, $numeric, $parent_server, $start_time, $link_time, $description) {
+               $this->name = $name;
+               $this->numeric = $numeric;
+               $this->parent_server = $parent_server;
+               $this->start_time = $start_time;
+               $this->link_time = $link_time;
+               $this->description = $description;
+               
+               self::$static_servers[$numeric] = $this;
+       }
+       
+       public function disconnectServer($linked_only = false) {
+               if(!$linked_only) {
+                       if($this->parent_server) {
+                               $this->parent_server->delServer($this);
+                       }
+                       $this->disconnectUsers();
+                       unset(self::$static_servers[$this->numeric]);
+               }
+               foreach($this->servers as $server) {
+                       $server->disconnectServer();
+               }
+       }
+       
+       public function disconnectUsers() {
+               //disconnect all Users connected to the actual Server
+       }
+       
+       public function getNumeric() {
+               return $this->numeric;
+       }
+       
+       public function addServer($server) {
+               $this->servers[$server->getNumeric()] = $server;
+       }
+       
+       public function delServer($server) {
+               if(array_key_exists($server->getNumeric(), $this->servers)) {
+                       unset($this->servers[$server->getNumeric()]);
+               } else {
+                       trigger_error("Tried to remove a Server, that does NOT exist.", E_USER_WARNING);
+               }
+       }
+}
+
+?>
\ No newline at end of file
index d9ac2211afdaf715f3ec34ab65bda4143a6f4292..c9de4102de829d949f599e781311dc8db3ae50bf 100644 (file)
@@ -27,6 +27,9 @@
  ************************************************************************
  * accessable methods:
  *
+ * void initialize()
+ *     has to be called after the settings have been set.
+ *
  * void loop() 
  *     loop function that should be calles as many times as possible. 
  *     It reads from the socket and BLOCKS the script execution for a 
@@ -38,7 +41,7 @@
  * void setLoopTimeout(int $timeout)
  *     sets the maximum time loop() is blocking the script execution.
  *
- * void setUplinkServer(int $numeric, String $name, String $password)
+ * void setUplinkServer(int $numeric, String $name, String $password, String $description)
  *     sets the own P10 Server information.
  *
  * void setValidateServer(String $name, String $password)
@@ -51,8 +54,9 @@ require_once("P10Formatter.class.php");
 class Uplink {
        private $client = new Client();
        private $settings = array();
+       private $server;
        
-       const FLAG_P10SESSION      = 0x0001; //connection is in P10 mode (parser relevant)
+       const FLAG_P10SESSION      = 0x0001; //connection is in P10 mode (server is connected)
        const FLAG_SECURITY_QUIT   = 0x0002; //local connection abort because of security issues
        const FLAG_NOT_CONNECTABLE = 0x0004; //remote server is not connectable
        private $flags = 0;
@@ -61,15 +65,35 @@ class Uplink {
                $this->setSettings("recv_timeout", 1000);
        }
        
+       public function initialize() {
+               if($this->server) {
+                       trigger_error("Uplink already initialized.", E_USER_ERROR);
+                       return;
+               }
+               $self_numeric = $this->getSetting("numeric");
+               $self_name = $this->getSetting("name");
+               $self_description = $this->getSetting("description");
+               $this->server = new P10_Server($self_name, $self_numeric, null, time(), time(), $self_description);
+       }
+       
        public function loop() {
+               if($this->server == null) {
+                       trigger_error("Uplink not initialized.", E_USER_ERROR);
+                       return;
+               }
                if(!$this->client->connected()) {
+                       if(($this->flags & self::FLAG_P10SESSION)) {
+                               //Server got disconnected
+                               $this->server->disconnectServer(true);
+                               $this->flags &= ~self::FLAG_P10SESSION;
+                       }
                        $host = $this->getSetting("host");
                        $port = $this->getSetting("port");
                        if($host == null || $port == null) {
-                               Throw new Exception("Uplink Settings missing.");
+                               trigger_error("Uplink Settings missing.", E_USER_ERROR);
                                return;
                        }
-                       if(($flags & self::FLAG_SECURITY_QUIT) || ($flags & self::FLAG_NOT_CONNECTABLE)) {
+                       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"));
@@ -99,10 +123,11 @@ class Uplink {
                $this->setSetting("recv_timeout", $timeout);
        }
        
-       public function setUplinkServer($numeric, $name, $password) {
+       public function setUplinkServer($numeric, $name, $password, $description) {
                $this->setSetting("numeric", Numerics::intToNum($numeric, 2));
                $this->setSetting("name", $name);
                $this->setSetting("password", $password);
+               $this->setSetting("description", $description);
        }
        
        public function setValidateServer($name, $password) {
@@ -128,6 +153,7 @@ class Uplink {
                if(count($highExplode) > 1)
                        $tokens[] = $highExplode[1];
                $cmdPos = (($this->flags & self::FLAG_P10SESSION) ? 1 : 0);
+               if($tokens[0] == "ERROR") $cmdPos = 0; //override
                if($cmdPos == 1) $from = $tokens[0];
                else $from = null;
                $arguments = array_slice($tokens, $cmdPos + 1);
@@ -180,7 +206,27 @@ class Uplink {
        }
        
        private function recv_server($from, $args) {
-               
+               if($from == null) {
+                       //our uplink Server
+                       $their_name = $this->getSetting("their_name");
+                       if($their_name && $args[0] != $their_name) {
+                               $this->flags |= self::FLAG_SECURITY_QUIT;
+                               $this->send("ERROR", "Invalid Server name");
+                               $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);
+               } else {
+                       //another server got a new slave server ^^
+                       $server = P10_Server::getServerByNum($from);
+                       if($server == null) {
+                               trigger_error("Parent Server (".$from.") does not exist or was not found on recv_server.", E_USER_ERROR);
+                               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);
+               }
        }
        
 }
index 954aa6b07f549813fcb5511f8a29925ef35dd132..123ccaeb18eeef5a36c4f858273de602756d1155 100644 (file)
--- a/main.php
+++ b/main.php
@@ -30,7 +30,7 @@ require_once("Uplink/Uplink.class.php");
 //basicly here is nothing, yet :D
 $uplink = new Uplink();
 $uplink->setUplinkHost("localhost", 4402);
-$uplink->setUplinkServer(5, "php.local.TestNet", "very_weak_password");
+$uplink->setUplinkServer(5, "php.local.TestNet", "very_weak_password", "Test Server");
 
 while(true) {
        $uplink->loop();