From 3ff00f264808bccde553b75fcd976cd47790d719 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 1 May 2009 08:45:29 +0000 Subject: [PATCH] Part added to detected hostname on Sun Solaris TODO: We should put this in seperate classes --- .../main/console/class_ConsoleTools.php | 65 ++++++++++++++----- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php index e97a5f6e..2dfe18ff 100644 --- a/inc/classes/main/console/class_ConsoleTools.php +++ b/inc/classes/main/console/class_ConsoleTools.php @@ -32,6 +32,42 @@ class ConsoleTools extends BaseFrameworkSystem { parent::__construct(__CLASS__); } + /** + * Tries to resolve an IP address from given hostname. Currently only IPv + * addresses are resolved. + * + * @param $hostname Host name we shall resolve + * @return $ip IP address resolved from host name + */ + protected function resolveIpAddress ($hostname) { + // Debug message + $this->debugOutput(sprintf("[%s:] Our host name is: %s", + $this->__toString(), + $hostname + )); + + // Default is an invalid one + $ip = '0.0.0.0'; + + // Resolve it + $ipResolved = gethostbyname($hostname); + + // Was it fine? + if (($ipResolved !== false) && ($ipResolved != $hostname)) { + // Okay, this works! + $ip = $ipResolved; + + // Debug message + $this->debugOutput(sprintf("[%s:] Resolved IP address is: %s\n", + $this->__toString(), + $ip + )); + } // END - if + + // Return resolved IP + return $ip; + } + /** * Aquires the IP address of this host by reading the /etc/hostname file and solving it * @@ -39,35 +75,32 @@ class ConsoleTools extends BaseFrameworkSystem { */ public static function acquireSelfIPAddress () { // Local IP by default - $ip = "127.0.0.1"; + $ip = '127.0.0.1'; // Get a new instance $helper = new ConsoleTools(); try { // Get a file pointer - $io = FrameworkFileInputPointer::createFrameworkFileInputPointer("/etc/hostname"); + $io = FrameworkFileInputPointer::createFrameworkFileInputPointer('/etc/hostname'); // Read the file $hostname = trim($io->readFromFile()); - $helper->debugOutput(sprintf("[%s:] Our host name is: %s", - $helper->__toString(), - $hostname - )); // Close the file $io->closeFile(); - // Resolve it - $ipResolved = gethostbyname($hostname); - if (($ipResolved !== false) && ($ipResolved != $hostname)) { - // Okay, this works! - $ip = $ipResolved; - - // Debug message - $helper->debugOutput(sprintf("[%s:] Resolved IP address is: %s\n", - $helper->__toString(), - $ip + // Resolve the IP number + $ip = $helper->resolveIpAddress($hostname); + } catch (FileNotFoundException $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']); + } else { + // Could not find our hostname + $helper->debugOutput(sprintf("[%s:] WARNING: Cannot resolve my own IP address.", + $helper->__toString() )); } } catch (FrameworkException $e) { -- 2.39.5