[Opalvoip-svn] SF.net SVN: opalvoip:[26710] ptlib/trunk/src/ptlib/unix/socket.cxx

[<rjo...@us...>]

Revision: 26710
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=26710&view=rev
Author:   rjongbloed
Date:     2011-11-30 04:40:25 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Reversed out GetInterfaceTable() revision 26702 as it does not provide MAC address and breaks paying customers code.

Revision Links:
--------------
    http://opalvoip.svn.sourceforge.net/opalvoip/?rev=26702&view=rev

Modified Paths:
--------------
    ptlib/trunk/src/ptlib/unix/socket.cxx

Modified: ptlib/trunk/src/ptlib/unix/socket.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/socket.cxx	2011-11-30 03:47:35 UTC (rev 26709)
+++ ptlib/trunk/src/ptlib/unix/socket.cxx	2011-11-30 04:40:25 UTC (rev 26710)
@@ -61,12 +61,6 @@
   #include "linux/errqueue.h"
 #endif
 
-#if defined(P_LINUX)
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <ifaddrs.h>
-#endif
-
 #if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_SOLARIS) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_IRIX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
 #define ifr_netmask ifr_addr
 
@@ -1948,8 +1942,8 @@
 
 PBoolean PIPSocket::GetInterfaceTable(InterfaceTable & list, PBoolean includeDown)
 {
-#if defined(P_LINUX) || defined(P_FREEBSD) || defined (P_NETBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_SOLARIS)
-  // tested on Linux 2.6.x, FreeBSD 8.2, NetBSD 5.1, OpenBSD 5.0, MacOS X 10.5.6 and Solaris 11
+#if defined(P_FREEBSD) || defined (P_NETBSD) || defined(P_OPENBSD) || defined(P_MACOSX) || defined(P_SOLARIS)
+  // tested on FreeBSD 8.2, NetBSD 5.1, OpenBSD 5.0, MacOS X 10.5.6 and Solaris 11, but seems to work fine on Linux, too
   struct ifaddrs *interfaces, *ifa;
 
   if (getifaddrs(&interfaces) == 0) {

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