X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fconsole%2Fclass_ConsoleTools.php;h=ef97485be4fa72e2f131e9d866d108610800b503;hb=87f159865b77c22625924b2563b0f1f953c09dd1;hp=52e8b0dc2acb182b04863ad1ce51bf9140519d1a;hpb=84e2207412d3c6ea9f940a83b2cdd4503509808a;p=core.git

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 52e8b0dc..ef97485b 100644
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -4,7 +4,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -22,6 +22,10 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ConsoleTools extends BaseFrameworkSystem {
+	// Constants
+	const HTTP_EOL = "\r\n";
+	const HTTP_USER_AGENT = 'ConsoleTools/1.0';
+
 	/**
 	 * Protected constructor
 	 *
@@ -87,7 +91,7 @@ class ConsoleTools extends BaseFrameworkSystem {
 		$ip = '127.0.0.1';
 
 		// Get a new instance
-		$helper = new ConsoleTools();
+		$helperInstance = new ConsoleTools();
 
 		try {
 			// Get a file pointer
@@ -100,22 +104,22 @@ class ConsoleTools extends BaseFrameworkSystem {
 			$io->closeFile();
 
 			// Resolve the IP number
-			$ip = $helper->resolveIpAddress($hostname);
+			$ip = $helperInstance->resolveIpAddress($hostname);
 		} catch (FileIoException $e) {
 			// Fall-back to 'SESSION_SVR' which found on my Sun Station
 			if (isset($_SERVER['SESSION_SVR'])) {
 				// Resolve it
-				$ip = $helper->resolveIpAddress($_SERVER['SESSION_SVR']);
+				$ip = $helperInstance->resolveIpAddress($_SERVER['SESSION_SVR']);
 			} else {
 				// Could not find our hostname
-				$helper->debugOutput(sprintf("[%s:] WARNING: Cannot resolve my own IP address.",
-					$helper->__toString()
+				$helperInstance->debugOutput(sprintf("[%s:] WARNING: Cannot resolve my own IP address.",
+					$helperInstance->__toString()
 				));
 			}
 		} catch (FrameworkException $e) {
 			// Output debug message
-			$helper->debugOutput(sprintf("[%s:] Problem while resolving own IP address: [%s|%s]:%s",
-				$helper->__toString(),
+			$helperInstance->debugOutput(sprintf("[%s:] Problem while resolving own IP address: [%s|%s]:%s",
+				$helperInstance->__toString(),
 				$e->__toString(),
 				$e->getHexCode(),
 				$e->getMessage()
@@ -123,51 +127,60 @@ class ConsoleTools extends BaseFrameworkSystem {
 		}
 
 		// Set it in configuration
-		FrameworkConfiguration::getInstance()->setServerAddress($ip);
+		FrameworkConfiguration::getSelfInstance()->setServerAddress($ip);
 	}
 
 	/**
 	 * Determines own remote IP address (e.g. can be used to probe if we are
 	 * reachable from outside by determining external IP and then connect to it.
 	 * This is accomblished by connecting to the IP of www.ship-simu.org which
-	 * should default to 217.172.186.31. Of course, this method requires a valid
-	 * and working Internet connection to work properly.
+	 * should default to 188.138.90.169 and requesting /ip.php which does only
+	 * return the content of $_SERVER['REMOTE_ADDR']. Of course, this method
+	 * requires a working Internet connection.
 	 *
-	 * This method is taken and lightly rewritten from a user comment on php.net:
+	 * This method is taken from a user comment on php.net and heavily rewritten.
+	 * Compare to following link:
 	 * http://de.php.net/manual/en/function.socket-create.php#49368
 	 *
-	 * @param	$dest				IP destination we should connect to
-	 * @param	$port				Port destination we should connect to
 	 * @return	$externalAddress	The determined external IP address
 	 * @throws	InvalidSocketException	If socket initialization wents wrong or if an errors occurs
+	 * @todo	This should be moved out to an external class, e.g. HttpClient
+	 * @todo	Make IP, host name, port and script name configurable
 	 */
-	public function determineExternalIp ($dest = '217.172.186.31', $port = 80) {
-		// First get a socket
-		$socket = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-
-		// Is it valid?
-		if (!is_resource($socket)) {
-			// Throw InvalidSocketException
-			throw new InvalidSocketException (array($this, gettype($socket), 0, 'unknown'));
-		} // END - if
+	public static function determineExternalIp () {
+		// Get helper instance
+		$helperInstance = new ConsoleTools();
 
-		// Get socket error code for verification
-		$socketError = socket_last_error($socket);
+		// First get a socket
+		// @TODO Add some DNS caching here
+		$socketResource = fsockopen('188.138.90.169', 80, $errorNo, $errorStr, 5);
 
 		// Check if there was an error else
-		if ($socketError > 0) {
+		if ($errorNo > 0) {
 			// Then throw again
-			throw new InvalidSocketException(array($this, gettype($socket), $socketError, socket_strerror($socketError)), BaseListener::EXCEPTION_INVALID_SOCKET);
+			throw new InvalidSocketException(array($helperInstance, $socketResource, $errorNo, $errorStr), BaseListener::EXCEPTION_INVALID_SOCKET);
 		} // END - if
 
-		// Connect to the destination
-		socket_connect($socket, $dest, $port);
+		// Prepare the GET request
+		$request  = 'GET /ip.php HTTP/1.0' . self::HTTP_EOL;
+		$request .= 'Host: ship-simu.org' . self::HTTP_EOL;
+		$request .= 'User-Agent: ' . self::HTTP_USER_AGENT . self::HTTP_EOL;
+		$request .= 'Connection: close' . self::HTTP_EOL;
+		$request .= self::HTTP_EOL;
+
+		// Send it to the socket
+		fwrite($socketResource, $request);
+
+		// Init IP (this will always be the last line)
+		$externalAddress = 'invalid';
 
-		// Get the socket address (our external IP) and port (ignored)
-		socket_getsockname($socket, $externalAddress, $ourPort);
+		// And read the reply
+		while (!feof($socketResource)) {
+			$externalAddress = fgets($socketResource, 128);
+		} // END - while
 
-		// Close the socket
-		socket_close($socket);
+		// Close socket
+		fclose($socketResource);
 
 		// Return determined external IP
 		return $externalAddress;