diff options
| author | Yuri Pankov <yuri.pankov@nexenta.com> | 2013-02-06 13:53:06 +0400 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2013-03-04 16:42:52 -0500 |
| commit | 41610d101ac089e52e33b0a671581e0c80d256c0 (patch) | |
| tree | d379a8db898353db9582a377bf2cd44b24afeb89 | |
| parent | d04756377ddd1cf28ebcf652541094e17b03c889 (diff) | |
| download | illumos-joyent-41610d101ac089e52e33b0a671581e0c80d256c0.tar.gz | |
3530 ::smbsess prints wrong IP addresses in verbose mode, has no idea about IPv6
Reviewed by: Gordon Ross <gwr@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Bayard Bell <Bayard.Bell@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
| -rw-r--r-- | usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c | 67 |
1 files changed, 53 insertions, 14 deletions
diff --git a/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c b/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c index 932637d26e..83ffae0634 100644 --- a/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c +++ b/usr/src/cmd/mdb/common/modules/smbsrv/smbsrv.c @@ -18,9 +18,10 @@ * * CDDL HEADER END */ + /* - * Copyright 2011 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ #include <mdb/mdb_modapi.h> @@ -713,7 +714,6 @@ smb_dcmd_session_help(void) * * smbsess dcmd - Print out the smb_session structure. */ -/*ARGSUSED*/ static int smb_dcmd_session(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) { @@ -749,8 +749,23 @@ smb_dcmd_session(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) if (opts & SMB_OPT_VERBOSE) { mdb_printf("%<b>%<u>SMB session information " "(%p): %</u>%</b>\n", addr); - mdb_printf("Client IP address: %I\n", se->ipaddr); - mdb_printf("Local IP Address: %I\n", se->local_ipaddr); + switch (se->ipaddr.a_family) { + case AF_INET: + mdb_printf("Client IP address: %I\n", + se->ipaddr.a_ipv4); + mdb_printf("Local IP Address: %I\n", + se->local_ipaddr.a_ipv4); + break; + case AF_INET6: + mdb_printf("Client IP address: %N\n", + &(se->ipaddr.a_ipv6)); + mdb_printf("Local IP Address: %N\n", + &(se->local_ipaddr.a_ipv6)); + break; + default: + mdb_printf("Client IP address: unknown\n"); + mdb_printf("Local IP Address: unknown\n"); + } mdb_printf("Session KID: %u\n", se->s_kid); mdb_printf("Workstation Name: %s\n", se->workstation); @@ -764,17 +779,41 @@ smb_dcmd_session(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv) mdb_printf("Number of active Transact.: %u\n\n", se->s_xa_list.ll_count); } else { - if (DCMD_HDRSPEC(flags)) - mdb_printf( - "%<b>%<u>%-?s " - "%-16s " - "%-16s %-16s%</u>%</b>\n", - "SESSION", "CLIENT_IP_ADDR", - "LOCAL_IP_ADDR", "STATE"); + char cipaddr[INET6_ADDRSTRLEN]; + char lipaddr[INET6_ADDRSTRLEN]; + int ipaddrstrlen; + + switch (se->ipaddr.a_family) { + case AF_INET: + ipaddrstrlen = INET_ADDRSTRLEN; + (void) mdb_snprintf(cipaddr, sizeof (cipaddr), + "%I", se->ipaddr.a_ipv4); + (void) mdb_snprintf(lipaddr, sizeof (lipaddr), + "%I", se->local_ipaddr.a_ipv4); + break; + case AF_INET6: + ipaddrstrlen = INET6_ADDRSTRLEN; + (void) mdb_snprintf(cipaddr, sizeof (cipaddr), + "%N", &(se->ipaddr.a_ipv6)); + (void) mdb_snprintf(lipaddr, sizeof (lipaddr), + "%N", &(se->local_ipaddr.a_ipv6)); + break; + default: + ipaddrstrlen = INET_ADDRSTRLEN; + (void) mdb_snprintf(cipaddr, sizeof (cipaddr), + "unknown"); + (void) mdb_snprintf(lipaddr, sizeof (lipaddr), + "unknown"); + } - mdb_printf( - "%-?p %-16I %-16I %s\n", addr, se->ipaddr.a_ipv4, - se->local_ipaddr.a_ipv4, state); + if (DCMD_HDRSPEC(flags)) { + mdb_printf( + "%<b>%<u>%-?s %-*s %-*s %-16s%</u>%</b>\n", + "SESSION", ipaddrstrlen, "CLIENT_IP_ADDR", + ipaddrstrlen, "LOCAL_IP_ADDR", "STATE"); + } + mdb_printf("%-?p %-*s %-*s %s\n", addr, ipaddrstrlen, + cipaddr, ipaddrstrlen, lipaddr, state); } } if (smb_obj_expand(addr, opts, smb_session_exp, indent)) |