[Phpsysinfo-subversion] SF.net SVN: phpsysinfo:[694] branches/namiltd-ini/includes/os/class.Linux. inc.php

[<na...@us...>]

Revision: 694
          http://phpsysinfo.svn.sourceforge.net/phpsysinfo/?rev=694&view=rev
Author:   namiltd
Date:     2012-09-09 09:28:32 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
show P-t-P address

Modified Paths:
--------------
    branches/namiltd-ini/includes/os/class.Linux.inc.php

Modified: branches/namiltd-ini/includes/os/class.Linux.inc.php
===================================================================
--- branches/namiltd-ini/includes/os/class.Linux.inc.php	2012-09-09 00:20:11 UTC (rev 693)
+++ branches/namiltd-ini/includes/os/class.Linux.inc.php	2012-09-09 09:28:32 UTC (rev 694)
@@ -262,7 +262,7 @@
                     }
                 }
                 // sparc64 specific code ends
-                
+
                 // XScale detection code
                 if ($dev->getModel() === "") {
                     foreach ($details as $detail) {
@@ -451,10 +451,17 @@
                         foreach ($bufe2 as $buf2) {
                             if (preg_match('/\s+encap:Ethernet\s+HWaddr\s(\S*)/i', $buf2, $ar_buf2))
                                 $dev->setInfo(preg_replace('/:/', '-', $ar_buf2[1]));
+                            else if (preg_match('/^\s+inet\saddr:(\S*)\s+P-t-P:(\S*)/i', $buf2, $ar_buf2)) {
+                                    if ($ar_buf2[1] != $ar_buf2[2]) {
+                                         $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1].";:".$ar_buf2[2]);
+                                    } else {
+                                         $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+                                    }
+                                 }
                             else if (preg_match('/^\s+inet\saddr:(\S*)/i', $buf2, $ar_buf2))
-                                     $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
-                                 else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
-                                      $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+                                 $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
+                            else if (preg_match('/^\s+inet6\saddr:\s([^\/]*)(.*)\s+Scope:[GH]/i', $buf2, $ar_buf2))
+                                 $dev->setInfo(($dev->getInfo()?$dev->getInfo().';':'').$ar_buf2[1]);
                         }
                     }
                     $this->sys->setNetDevices($dev);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.