From 2f7b72f9e8d06c80957cdf384d23d3bf5bd5ce5c Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Mon, 27 Sep 2010 22:49:11 -0700 Subject: [PATCH] netstat should include /proc/net/tcp6 and /proc/net/udp6 data Update netstat.c to process /proc/net/tcp6 and /proc/net/udp6. Example input and output and output follows. cat /proc/net/tcp: sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode 0: 0100007F:13AD 00000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 669 1 c74dbb40 300 0 0 2 -1 1: 0100007F:A432 0100007F:2253 01 00000000:00000000 00:00000000 00000000 0 0 15257 1 c74da040 22 4 16 2 -1 cat /proc/net/udp: sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops cat /proc/net/tcp6: sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode 0: 00000000000000000000000000000000:8A88 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15461 1 c730aaa0 300 0 0 2 -1 1: 00000000000000000000000000000000:2253 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15255 1 c7393060 300 0 0 2 -1 2: 00000000000000000000000000000000:C91B 00000000000000000000000000000000:0000 0A 00000000:00000000 00:00000000 00000000 0 0 15261 1 c6591080 300 0 0 2 -1 3: 0000000000000000FFFF00000100007F:C91B 0000000000000000FFFF00000100007F:9238 01 00000000:00000000 00:00000000 00000000 0 0 15263 1 c7394aa0 22 4 29 4 -1 4: 0000000000000000FFFF00000100007F:C0E9 0000000000000000FFFF00000100007F:D3A4 01 00000000:00000000 00:00000000 00000000 0 0 15274 1 c7393aa0 22 4 26 4 -1 5: 0000000000000000FFFF00000100007F:C41A 0000000000000000FFFF00000100007F:B031 01 00000000:00000000 00:00000000 00000000 0 0 15269 1 c7126ac0 22 4 29 4 -1 6: 0000000000000000FFFF00000100007F:2253 0000000000000000FFFF00000100007F:A432 01 00000000:00000000 00:00000000 00000000 0 0 15256 1 c65e9040 21 0 0 5 -1 7: 0000000000000000FFFF00000100007F:9238 0000000000000000FFFF00000100007F:C91B 01 00000000:00000000 00:00000000 00000000 0 0 15262 1 c7394580 22 4 16 4 -1 8: 0000000000000000FFFF00000100007F:B031 0000000000000000FFFF00000100007F:C41A 01 00000000:00000000 00:00000000 00000000 0 0 15268 1 c71585a0 22 4 16 4 -1 9: 0000000000000000FFFF00000100007F:8A88 0000000000000000FFFF00000100007F:8A31 01 00000000:00000000 00:00000000 00000000 0 0 15503 1 c71265a0 22 4 30 2 -1 10: 0000000000000000FFFF00000100007F:D3A4 0000000000000000FFFF00000100007F:C0E9 01 00000000:00000000 00:00000000 00000000 0 0 15273 1 c7126080 22 4 12 4 -1 11: 0000000000000000FFFF00000100007F:8A31 0000000000000000FFFF00000100007F:8A88 01 00000000:00000000 00:00000000 00000000 0 0 15502 1 c730a060 22 0 0 3 -1 cat /proc/net/udp6: sl local_address remote_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode ref pointer drops 86: 00000000000000000000000000000000:A256 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14302 2 c6d13820 0 102: 00000000000000000000000000000000:A466 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14301 2 c6d13ac0 0 125: 00000000000000000000000000000000:8B7D 00000000000000000000000000000000:0000 07 00000000:00000000 00:00000000 00000000 1000 0 14295 2 c6d13d60 0 netstat: Proto Recv-Q Send-Q Local Address Foreign Address State tcp 0 0 127.0.0.1:5037 0.0.0.0:* LISTEN tcp 0 0 127.0.0.1:42034 127.0.0.1:8787 ESTABLISHED tcp6 0 0 :::35464 :::* LISTEN tcp6 0 0 :::8787 :::* LISTEN tcp6 0 0 :::51483 :::* LISTEN tcp6 0 0 ::ffff:127.0.0.1:51483 ::ffff:127.0.0.1:37432 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:49385 ::ffff:127.0.0.1:54180 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:50202 ::ffff:127.0.0.1:45105 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:8787 ::ffff:127.0.0.1:42034 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:37432 ::ffff:127.0.0.1:51483 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:45105 ::ffff:127.0.0.1:50202 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:35464 ::ffff:127.0.0.1:35377 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:54180 ::ffff:127.0.0.1:49385 ESTABLISHED tcp6 0 0 ::ffff:127.0.0.1:35377 ::ffff:127.0.0.1:35464 ESTABLISHED udp6 0 0 :::41558 :::* CLOSE udp6 0 0 :::42086 :::* CLOSE udp6 0 0 :::35709 :::* CLOSE Bug: 2511871 Change-Id: I25e0470ba65e8a88e57506ae26232a7c43a9c16b --- toolbox/Android.mk | 2 +- toolbox/netstat.c | 144 ++++++++++++++++++++++++++++----------------- 2 files changed, 90 insertions(+), 56 deletions(-) diff --git a/toolbox/Android.mk b/toolbox/Android.mk index 588dac0b2..ef3980aaa 100644 --- a/toolbox/Android.mk +++ b/toolbox/Android.mk @@ -41,7 +41,7 @@ TOOLS := \ printenv \ smd \ chmod \ - chown \ + chown \ newfs_msdos \ netstat \ ioctl \ diff --git a/toolbox/netstat.c b/toolbox/netstat.c index 640430925..5768599a4 100644 --- a/toolbox/netstat.c +++ b/toolbox/netstat.c @@ -9,7 +9,7 @@ * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the + * the documentation and/or other materials provided with the * distribution. * * Neither the name of Google, Inc. nor the names of its contributors * may be used to endorse or promote products derived from this @@ -22,23 +22,37 @@ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include #include #include +#include +#include typedef union iaddr iaddr; +typedef union iaddr6 iaddr6; union iaddr { unsigned u; unsigned char b[4]; }; - + +union iaddr6 { + struct { + unsigned a; + unsigned b; + unsigned c; + unsigned d; + } u; + unsigned char b[16]; +}; + static const char *state2str(unsigned state) { switch(state){ @@ -57,64 +71,84 @@ static const char *state2str(unsigned state) } } -void addr2str(iaddr addr, unsigned port, char *buf) +/* addr + : + port + \0 */ +#define ADDR_LEN INET6_ADDRSTRLEN + 1 + 5 + 1 + +static void addr2str(int af, const void *addr, unsigned port, char *buf) { - if(port) { - snprintf(buf, 64, "%d.%d.%d.%d:%d", - addr.b[0], addr.b[1], addr.b[2], addr.b[3], port); - } else { - snprintf(buf, 64, "%d.%d.%d.%d:*", - addr.b[0], addr.b[1], addr.b[2], addr.b[3]); + if (inet_ntop(af, addr, buf, ADDR_LEN) == NULL) { + *buf = '\0'; + return; } + size_t len = strlen(buf); + if (port) { + snprintf(buf+len, ADDR_LEN-len, ":%d", port); + } else { + strncat(buf+len, ":*", ADDR_LEN-len-1); + } +} + +static void ipv4(const char *filename, const char *label) { + FILE *fp = fopen(filename, "r"); + if (fp == NULL) { + return; + } + char buf[BUFSIZ]; + fgets(buf, BUFSIZ, fp); + while (fgets(buf, BUFSIZ, fp)){ + char lip[ADDR_LEN]; + char rip[ADDR_LEN]; + iaddr laddr, raddr; + unsigned lport, rport, state, txq, rxq, num; + int n = sscanf(buf, " %d: %x:%x %x:%x %x %x:%x", + &num, &laddr.u, &lport, &raddr.u, &rport, + &state, &txq, &rxq); + if (n == 8) { + addr2str(AF_INET, &laddr, lport, lip); + addr2str(AF_INET, &raddr, rport, rip); + + printf("%4s %6d %6d %-22s %-22s %s\n", + label, txq, rxq, lip, rip, + state2str(state)); + } + } + fclose(fp); +} + +static void ipv6(const char *filename, const char *label) { + FILE *fp = fopen(filename, "r"); + if (fp == NULL) { + return; + } + char buf[BUFSIZ]; + fgets(buf, BUFSIZ, fp); + while (fgets(buf, BUFSIZ, fp)){ + char lip[ADDR_LEN]; + char rip[ADDR_LEN]; + iaddr6 laddr6, raddr6; + unsigned lport, rport, state, txq, rxq, num; + int n = sscanf(buf, " %d: %8x%8x%8x%8x:%x %8x%8x%8x%8x:%x %x %x:%x", + &num, &laddr6.u.a, &laddr6.u.b, &laddr6.u.c, &laddr6.u.d, &lport, + &raddr6.u.a, &raddr6.u.b, &raddr6.u.c, &raddr6.u.d, &rport, + &state, &txq, &rxq); + if (n == 14) { + addr2str(AF_INET6, &laddr6, lport, lip); + addr2str(AF_INET6, &raddr6, rport, rip); + + printf("%4s %6d %6d %-22s %-22s %s\n", + label, txq, rxq, lip, rip, + state2str(state)); + } + } + fclose(fp); } int netstat_main(int argc, char *argv[]) { - char buf[512]; - char lip[64]; - char rip[64]; - iaddr laddr, raddr; - unsigned lport, rport, state, txq, rxq, num; - int n; - FILE *fp; - printf("Proto Recv-Q Send-Q Local Address Foreign Address State\n"); - - fp = fopen("/proc/net/tcp", "r"); - if(fp != 0) { - fgets(buf, 512, fp); - while(fgets(buf, 512, fp)){ - n = sscanf(buf, " %d: %x:%x %x:%x %x %x:%x", - &num, &laddr.u, &lport, &raddr.u, &rport, - &state, &txq, &rxq); - if(n == 8) { - addr2str(laddr, lport, lip); - addr2str(raddr, rport, rip); - - printf("tcp %6d %6d %-22s %-22s %s\n", - txq, rxq, lip, rip, - state2str(state)); - } - } - fclose(fp); - } - fp = fopen("/proc/net/udp", "r"); - if(fp != 0) { - fgets(buf, 512, fp); - while(fgets(buf, 512, fp)){ - n = sscanf(buf, " %d: %x:%x %x:%x %x %x:%x", - &num, &laddr.u, &lport, &raddr.u, &rport, - &state, &txq, &rxq); - if(n == 8) { - addr2str(laddr, lport, lip); - addr2str(raddr, rport, rip); - - printf("udp %6d %6d %-22s %-22s\n", - txq, rxq, lip, rip); - } - } - fclose(fp); - } - + ipv4("/proc/net/tcp", "tcp"); + ipv4("/proc/net/udp", "udp"); + ipv6("/proc/net/tcp6", "tcp6"); + ipv6("/proc/net/udp6", "udp6"); return 0; }