[prev in list] [next in list] [prev in thread] [next in thread]
List: busybox
Subject: [BusyBox] Add support IPv6 to netstat
From: Bart Visscher <magick () Linux-Fan ! com>
Date: 2002-04-28 9:00:19
[Download RAW message or body]
Changelog:
* Add support IPv6 to netstat
Remark:
Can use an option for IPv4/IPv6 selection.
["10-netstat.patch" (text/x-patch)]
diff -ru -X exclude -P busybox-new/networking/netstat.c busybox-new-0/networking/netstat.c
--- busybox-new/networking/netstat.c Wed Apr 24 22:23:12 2002
+++ busybox-new-0/networking/netstat.c Thu Apr 25 21:52:15 2002
@@ -3,7 +3,7 @@
* Mini netstat implementation(s) for busybox
* based in part on the netstat implementation from net-tools.
*
- * Copyright (C) 2001 by Bart Visscher <magick@linux-fan.com>
+ * Copyright (C) 2002 by Bart Visscher <magick@linux-fan.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +18,9 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * 2002-04-20
+ * IPV6 support added by Bart Visscher <magick@linux-fan.com>
*/
#include <stdio.h>
@@ -124,9 +127,17 @@
{
char *port_name;
+#if CONFIG_FEATURE_IPV6
+ if (addr->sa_family == AF_INET6) {
+ INET6_rresolve(ip_port, size, (struct sockaddr_in6 *)addr,
+ (numeric&NETSTAT_NUMERIC) ? 0x0fff : 0);
+ } else
+#endif
+ {
INET_rresolve(ip_port, size, (struct sockaddr_in *)addr,
0x4000 | ((numeric&NETSTAT_NUMERIC) ? 0x0fff : 0),
0xffffffff);
+ }
port_name=get_sname(htons(port), proto, numeric);
if ((strlen(ip_port) + strlen(port_name)) > 22)
ip_port[22 - strlen(port_name)] = '\0';
@@ -140,7 +151,13 @@
char local_addr[64], rem_addr[64];
char *state_str, more[512];
int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+#if CONFIG_FEATURE_IPV6
+ struct sockaddr_in6 localaddr, remaddr;
+ char addr6[INET6_ADDRSTRLEN];
+ struct in6_addr in6;
+#else
struct sockaddr_in localaddr, remaddr;
+#endif
unsigned long rxq, txq, time_len, retr, inode;
if (lnr == 0)
@@ -154,6 +171,21 @@
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
if (strlen(local_addr) > 8) {
+#if CONFIG_FEATURE_IPV6
+ /* Demangle what the kernel gives us */
+ sscanf(local_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &localaddr.sin6_addr);
+ sscanf(rem_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &remaddr.sin6_addr);
+ localaddr.sin6_family = AF_INET6;
+ remaddr.sin6_family = AF_INET6;
+#endif
} else {
sscanf(local_addr, "%X",
&((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
@@ -190,7 +222,13 @@
char local_addr[64], rem_addr[64];
char *state_str, more[512];
int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+#if CONFIG_FEATURE_IPV6
+ struct sockaddr_in6 localaddr, remaddr;
+ char addr6[INET6_ADDRSTRLEN];
+ struct in6_addr in6;
+#else
struct sockaddr_in localaddr, remaddr;
+#endif
unsigned long rxq, txq, time_len, retr, inode;
if (lnr == 0)
@@ -204,6 +242,20 @@
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
if (strlen(local_addr) > 8) {
+#if CONFIG_FEATURE_IPV6
+ sscanf(local_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &localaddr.sin6_addr);
+ sscanf(rem_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &remaddr.sin6_addr);
+ localaddr.sin6_family = AF_INET6;
+ remaddr.sin6_family = AF_INET6;
+#endif
} else {
sscanf(local_addr, "%X",
&((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
@@ -231,7 +283,17 @@
break;
}
+#if CONFIG_FEATURE_IPV6
+#define notnull(A) (((A.sin6_family == AF_INET6) && \
+ ((A.sin6_addr.s6_addr32[0]) || \
+ (A.sin6_addr.s6_addr32[1]) || \
+ (A.sin6_addr.s6_addr32[2]) || \
+ (A.sin6_addr.s6_addr32[3]))) || \
+ ((A.sin6_family == AF_INET) && \
+ ((struct sockaddr_in *) &A)->sin_addr.s_addr))
+#else
#define notnull(A) (A.sin_addr.s_addr)
+#endif
if ((notnull(remaddr) && (flags&NETSTAT_CONNECTED)) ||
(!notnull(remaddr) && (flags&NETSTAT_LISTENING)))
{
@@ -254,7 +316,13 @@
char local_addr[64], rem_addr[64];
char *state_str, more[512];
int num, local_port, rem_port, d, state, timer_run, uid, timeout;
+#if CONFIG_FEATURE_IPV6
+ struct sockaddr_in6 localaddr, remaddr;
+ char addr6[INET6_ADDRSTRLEN];
+ struct in6_addr in6;
+#else
struct sockaddr_in localaddr, remaddr;
+#endif
unsigned long rxq, txq, time_len, retr, inode;
if (lnr == 0)
@@ -268,6 +336,20 @@
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
if (strlen(local_addr) > 8) {
+#if CONFIG_FEATURE_IPV6
+ sscanf(local_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &localaddr.sin6_addr);
+ sscanf(rem_addr, "%08X%08X%08X%08X",
+ &in6.s6_addr32[0], &in6.s6_addr32[1],
+ &in6.s6_addr32[2], &in6.s6_addr32[3]);
+ inet_ntop(AF_INET6, &in6, addr6, sizeof(addr6));
+ inet_pton(AF_INET6, addr6, (struct sockaddr *) &remaddr.sin6_addr);
+ localaddr.sin6_family = AF_INET6;
+ remaddr.sin6_family = AF_INET6;
+#endif
} else {
sscanf(local_addr, "%X",
&((struct sockaddr_in *) &localaddr)->sin_addr.s_addr);
@@ -283,7 +365,17 @@
}
state_str=itoa(state);
+#if CONFIG_FEATURE_IPV6
+#define notnull(A) (((A.sin6_family == AF_INET6) && \
+ ((A.sin6_addr.s6_addr32[0]) || \
+ (A.sin6_addr.s6_addr32[1]) || \
+ (A.sin6_addr.s6_addr32[2]) || \
+ (A.sin6_addr.s6_addr32[3]))) || \
+ ((A.sin6_family == AF_INET) && \
+ ((struct sockaddr_in *) &A)->sin_addr.s_addr))
+#else
#define notnull(A) (A.sin_addr.s_addr)
+#endif
if ((notnull(remaddr) && (flags&NETSTAT_CONNECTED)) ||
(!notnull(remaddr) && (flags&NETSTAT_LISTENING)))
{
@@ -424,8 +516,11 @@
}
#define _PATH_PROCNET_UDP "/proc/net/udp"
+#define _PATH_PROCNET_UDP6 "/proc/net/udp6"
#define _PATH_PROCNET_TCP "/proc/net/tcp"
+#define _PATH_PROCNET_TCP6 "/proc/net/tcp6"
#define _PATH_PROCNET_RAW "/proc/net/raw"
+#define _PATH_PROCNET_RAW6 "/proc/net/raw6"
#define _PATH_PROCNET_UNIX "/proc/net/unix"
static int do_info(char *file, char *name, void (*proc)(int, const char *))
@@ -462,6 +557,12 @@
{
int opt;
int new_flags=0;
+ int inet=1;
+#if CONFIG_FEATURE_IPV6
+ int inet6=1;
+#else
+#define inet6 0
+#endif
while ((opt = getopt(argc, argv, "lantuwx")) != -1)
switch (opt) {
case 'l':
@@ -506,12 +607,18 @@
}
printf("\nProto Recv-Q Send-Q Local Address Foreign Address State \n");
}
- if (flags&NETSTAT_TCP)
+ if (inet && flags&NETSTAT_TCP)
do_info(_PATH_PROCNET_TCP,"AF INET (tcp)",tcp_do_one);
- if (flags&NETSTAT_UDP)
+ if (inet6 && flags&NETSTAT_TCP)
+ do_info(_PATH_PROCNET_TCP6,"AF INET6 (tcp)",tcp_do_one);
+ if (inet && flags&NETSTAT_UDP)
do_info(_PATH_PROCNET_UDP,"AF INET (udp)",udp_do_one);
- if (flags&NETSTAT_RAW)
+ if (inet6 && flags&NETSTAT_UDP)
+ do_info(_PATH_PROCNET_UDP6,"AF INET6 (udp)",udp_do_one);
+ if (inet && flags&NETSTAT_RAW)
do_info(_PATH_PROCNET_RAW,"AF INET (raw)",raw_do_one);
+ if (inet6 && flags&NETSTAT_RAW)
+ do_info(_PATH_PROCNET_RAW6,"AF INET6 (raw)",raw_do_one);
if (flags&NETSTAT_UNIX) {
printf("Active UNIX domain sockets ");
if ((flags&(NETSTAT_LISTENING|NETSTAT_CONNECTED))==(NETSTAT_LISTENING|NETSTAT_CONNECTED))
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic