*** empty log message ***

This commit is contained in:
Martin Baulig
2000-02-04 23:13:46 +00:00
parent d3e83afb0a
commit a691993a86
2 changed files with 36 additions and 2 deletions

View File

@@ -8,3 +8,4 @@ auto-macros.texi
version.texi version.texi
stamp-vti stamp-vti
*.html *.pdf *.html *.pdf
*.info-*

View File

@@ -42,8 +42,18 @@
#define HAVE_AFINET6 1 #define HAVE_AFINET6 1
#endif #endif
#ifdef HAVE_AFINET6
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6" #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#define IPV6_ADDR_LOOPBACK 0x0010U
#define IPV6_ADDR_LINKLOCAL 0x0020U
#define IPV6_ADDR_SITELOCAL 0x0040U
#define IPV6_ADDR_COMPATv4 0x0080U
#endif /* HAVE_AFINET6 */
#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 #if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
/* GNU LibC */ /* GNU LibC */
#include <net/if.h> #include <net/if.h>
@@ -242,11 +252,34 @@ _netinfo_ipv6 (glibtop *server, glibtop_netinfo *buf,
address.flags |= (1L << GLIBTOP_IFADDR_ADDRESS); address.flags |= (1L << GLIBTOP_IFADDR_ADDRESS);
address.transport = GLIBTOP_TRANSPORT_IPV6; address.transport = GLIBTOP_TRANSPORT_IPV6;
address.addr_len = plen; address.subnet = plen;
address.scope = scope;
switch (scope) {
case 0:
address.scope = GLIBTOP_IPV6_SCOPE_GLOBAL;
break;
case IPV6_ADDR_LINKLOCAL:
address.scope = GLIBTOP_IPV6_SCOPE_LINKLOCAL;
break;
case IPV6_ADDR_SITELOCAL:
address.scope = GLIBTOP_IPV6_SCOPE_SITELOCAL;
break;
case IPV6_ADDR_COMPATv4:
address.scope = GLIBTOP_IPV6_SCOPE_COMPATv4;
break;
case IPV6_ADDR_LOOPBACK:
address.scope = GLIBTOP_IPV6_SCOPE_LOOPBACK;
break;
default:
address.scope = GLIBTOP_IPV6_SCOPE_UNKNOWN;
break;
}
address.addr_len = 8;
address.flags |= (1L << GLIBTOP_IFADDR_TRANSPORT) | address.flags |= (1L << GLIBTOP_IFADDR_TRANSPORT) |
(1L << GLIBTOP_IFADDR_ADDR_LEN) | (1L << GLIBTOP_IFADDR_ADDR_LEN) |
(1L << GLIBTOP_IFADDR_SUBNET) |
(1L << GLIBTOP_IFADDR_SCOPE); (1L << GLIBTOP_IFADDR_SCOPE);
g_ptr_array_add (parray, g_memdup (&address, sizeof (address))); g_ptr_array_add (parray, g_memdup (&address, sizeof (address)));