X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fconsole%2Fclass_ConsoleTools.php;h=0b75e3ab02281f0c5976b5afe79f24a113da69c7;hp=1fa79eec3b391186acd36e75ad6f8dc7bb82c87d;hb=d4151794443fe676282e693dbe9d709c8c5dc83d;hpb=9a31052e73b3f0743d2b9155e73c9f07c5edcc2d

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 1fa79eec..0b75e3ab 100644
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -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
 	 *
@@ -130,47 +134,51 @@ class ConsoleTools extends BaseFrameworkSystem {
 	 * 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 217.172.186.31 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
 	 */
-	public static function determineExternalIp ($dest = '217.172.186.31', $port = 80) {
+	public static function determineExternalIp () {
 		// Get helper instance
 		$helperInstance = new ConsoleTools();
 
 		// 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($helperInstance, gettype($socket), 0, 'unknown'));
-		} // END - if
-
-		// Get socket error code for verification
-		$socketError = socket_last_error($socket);
+		$socket = fsockopen('217.172.186.31', 80, $errorNo, $errorStr, 5);
 
 		// Check if there was an error else
-		if ($socketError > 0) {
+		if ($errorNo > 0) {
 			// Then throw again
-			throw new InvalidSocketException(array($helperInstance, gettype($socket), $socketError, socket_strerror($socketError)), BaseListener::EXCEPTION_INVALID_SOCKET);
+			throw new InvalidSocketException(array($helperInstance, gettype($socket), $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: www.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($socket, $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($socket)) {
+			$externalAddress = fgets($socket, 128);
+		} // END - while
 
-		// Close the socket
-		socket_close($socket);
+		// Close socket
+		fclose($socket);
 
 		// Return determined external IP
 		return $externalAddress;