PERFORCE change 166240 for review
Gabor Pali
pgj at FreeBSD.org
Sat Jul 18 18:53:42 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166240
Change 166240 by pgj at petymeg-current on 2009/07/18 18:53:27
- Rename addr_type to sockaddr_type, and refactor all of its fields,
functions. This is required because there can be other address
types, like the one for interfaces.
- Adjust applications.
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_tcp.c#4 edit
.. //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_udp.c#4 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#28 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#26 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_socket.c#2 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#31 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#23 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#20 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/nettop/main.c#11 edit
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_tcp.c#4 (text+ko) ====
@@ -71,7 +71,7 @@
struct socket_type_list *stlp;
struct socket_type_iterator *stip;
const struct socket_type *stp;
- struct addr_type *atp;
+ struct sockaddr_type *satp;
int error;
struct in_addr in;
@@ -133,22 +133,22 @@
stp = netstat_sti_next(stip)) {
oid->tcp_state = netstat_st_get_tcps(stp);
oid->index.len = 10;
- atp = netstat_st_get_address(stp, 0);
- netstat_at_get_address(atp, (char *) &in, sizeof(in));
+ satp = netstat_st_get_address(stp, 0);
+ netstat_sat_get_address(satp, (char *) &in, sizeof(in));
inaddr = ntohl(in.s_addr);
oid->index.subs[0] = (inaddr >> 24) & 0xff;
oid->index.subs[1] = (inaddr >> 16) & 0xff;
oid->index.subs[2] = (inaddr >> 8) & 0xff;
oid->index.subs[3] = (inaddr ) & 0xff;
- oid->index.subs[4] = netstat_at_get_port(atp);
- atp = netstat_st_get_address(stp, 1);
- netstat_at_get_address(atp, (char *) &in, sizeof(in));
+ oid->index.subs[4] = netstat_sat_get_port(satp);
+ satp = netstat_st_get_address(stp, 1);
+ netstat_sat_get_address(satp, (char *) &in, sizeof(in));
inaddr = ntohl(in.s_addr);
oid->index.subs[5] = (inaddr >> 24) & 0xff;
oid->index.subs[6] = (inaddr >> 16) & 0xff;
oid->index.subs[7] = (inaddr >> 8) & 0xff;
oid->index.subs[8] = (inaddr ) & 0xff;
- oid->index.subs[9] = netstat_at_get_port(atp);
+ oid->index.subs[9] = netstat_sat_get_port(satp);
oid++;
}
==== //depot/projects/soc2009/pgj_libstat/src/contrib/bsnmp/snmp_mibII/mibII_udp.c#4 (text+ko) ====
@@ -62,7 +62,7 @@
struct socket_type_list *stlp;
struct socket_type_iterator *stip;
const struct socket_type *stp;
- struct addr_type *atp;
+ struct sockaddr_type *satp;
int error;
struct asn_oid *oid;
@@ -115,14 +115,14 @@
for (stp = netstat_sti_first(stip); stp != NULL;
stp = netstat_sti_next(stip)) {
oid->len = 5;
- atp = netstat_st_get_address(stp, 0);
- netstat_at_get_address(atp, (char *) &in, sizeof(in));
+ satp = netstat_st_get_address(stp, 0);
+ netstat_sat_get_address(satp, (char *) &in, sizeof(in));
inaddr = ntohl(in.s_addr);
oid->subs[0] = (inaddr << 24) & 0xff;
oid->subs[1] = (inaddr << 16) & 0xff;
oid->subs[2] = (inaddr << 8) & 0xff;
oid->subs[3] = (inaddr ) & 0xff;
- oid->subs[4] = netstat_at_get_port(atp);
+ oid->subs[4] = netstat_sat_get_port(satp);
oid++;
}
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#28 (text+ko) ====
@@ -72,11 +72,12 @@
};
struct socket_type;
+struct sockaddr_type;
+struct sockbuf_type;
+
struct socket_type_list;
struct socket_type_iterator;
-struct addr_type;
-
struct mbuf_type;
@@ -104,7 +105,7 @@
void netstat_sti_free(struct socket_type_iterator *iterator);
void netstat_st_free(struct socket_type *stp);
-void netstat_at_free(struct addr_type *atp);
+void netstat_sat_free(struct sockaddr_type *satp);
int netstat_socket(int domain, int type, int protocol,
struct socket_type_list *, int flags, void *kvm_handle);
@@ -126,17 +127,17 @@
u_int64_t netstat_st_get_reflink(const struct socket_type *stp);
const char *netstat_st_get_tcpstate(const struct socket_type *stp);
enum tcp_state netstat_st_get_tcps(const struct socket_type *stp);
-/* Addresses: */
+/* Socket addresses: */
int netstat_st_get_addrcnt(const struct socket_type *stp);
-struct addr_type *netstat_st_get_address(const struct socket_type *stp,
+struct sockaddr_type *netstat_st_get_address(const struct socket_type *stp,
int index);
-const char *netstat_at_get_name(struct addr_type *atp);
-const char *netstat_at_get_numeric(const struct addr_type *atp);
-int netstat_at_get_address(const struct addr_type *atp,
+const char *netstat_sat_get_name(struct sockaddr_type *satp);
+const char *netstat_sat_get_numeric(const struct sockaddr_type *satp);
+int netstat_sat_get_address(const struct sockaddr_type *satp,
char *addr, int addr_len);
-u_int16_t netstat_at_get_port(const struct addr_type *atp);
-const char *netstat_at_get_portname(struct addr_type *atp);
+u_int16_t netstat_sat_get_port(const struct sockaddr_type *satp);
+const char *netstat_sat_get_portname(struct sockaddr_type *satp);
/* Socket buffers: */
u_int32_t netstat_sbt_get_cc(const struct sockbuf_type *sbtp);
u_int32_t netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp);
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#26 (text+ko) ====
@@ -45,18 +45,18 @@
/* Address type:
* local, foreign, node (Netgraph), raw (domain)
*/
-struct addr_type {
+struct sockaddr_type {
/* XXX: this should be an enum? */
- int at_type;
- char at_name[1024];
- int at_flags;
- struct socket_type * at_parent;
+ int sat_type;
+ char sat_name[1024];
+ int sat_flags;
+ struct socket_type * sat_parent;
/* numeric representation */
- char at_numeric[32];
- char *at_address;
- int at_address_len;
- uint16_t at_port;
- char at_portname[32];
+ char sat_numeric[32];
+ char *sat_address;
+ int sat_address_len;
+ uint16_t sat_port;
+ char sat_portname[32];
};
/* Socket buffer type */
@@ -70,10 +70,10 @@
u_int32_t sbt_mbmax;
};
-/* internal defines for addr_type: */
-#define ADDRTYPE_ANONPORT 0x01
-#define ADDRTYPE_NAME_RESOLVED 0x02
-#define ADDRTYPE_PORT_RESOLVED 0x04
+/* internal defines for sockaddr_type: */
+#define SOCKADDRTYPE_ANONPORT 0x01
+#define SOCKADDRTYPE_NAME_RESOLVED 0x02
+#define SOCKADDRTYPE_PORT_RESOLVED 0x04
#define NETSTAT_ADDRTYPE_LOCAL 0
#define NETSTAT_ADDRTYPE_INET_LOCAL 1
@@ -93,8 +93,8 @@
char st_extname[SOCKTYPE_MAXNAME];
/* address(es) */
- struct addr_type *st_address[SOCKTYPE_MAXADDRCNT];
- int st_addrcnt; /* address count */
+ struct sockaddr_type *st_address[SOCKTYPE_MAXADDRCNT];
+ int st_addrcnt; /* address count */
/* buffers */
struct sockbuf_type st_snd;
@@ -178,10 +178,11 @@
unsigned short family, unsigned short protocol,
const char *name);
void _netstat_st_reset_stats(struct socket_type *list);
-struct addr_type *_netstat_at_allocate(struct socket_type *parent, int type,
- const char *name, char *address, int addr_len);
-void _netstat_at_resolve_name(struct addr_type *addr);
-void _netstat_at_resolve_portname(struct addr_type *addr);
+struct sockaddr_type *_netstat_sat_allocate(struct socket_type *parent,
+ int type, const char *name, char *address,
+ int addr_len);
+void _netstat_sat_resolve_name(struct sockaddr_type *addr);
+void _netstat_sat_resolve_portname(struct sockaddr_type *addr);
int sotoxsocket(kvm_t * kvm, struct socket *so, struct xsocket *xso);
#endif /* !_NETSTAT_INTERNAL_H_ */
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_socket.c#2 (text+ko) ====
@@ -91,9 +91,9 @@
static char ntop_buf[INET_ADDRSTRLEN];
static char ntop_buf6[INET6_ADDRSTRLEN];
-static struct addr_type *extract_inet_address(struct socket_type *parent,
+static struct sockaddr_type *extract_inet_address(struct socket_type *parent,
int type, struct in_addr *in, u_short port, int anonport);
-static struct addr_type *extract_inet6_address(struct socket_type *parent,
+static struct sockaddr_type *extract_inet6_address(struct socket_type *parent,
int type, struct in6_addr *in, u_short port);
static int netstat_local_sockets(int, struct socket_type_list *, kvm_t *,
@@ -702,11 +702,11 @@
(int)(sa->sun_len - offsetof(struct sockaddr_un, sun_path)),
sa->sun_path);
stp->st_address[stp->st_addrcnt] =
- _netstat_at_allocate(stp, NETSTAT_ADDRTYPE_LOCAL, address,
+ _netstat_sat_allocate(stp, NETSTAT_ADDRTYPE_LOCAL, address,
NULL, 0);
- stp->st_address[stp->st_addrcnt]->at_port = 0;
- strcpy(stp->st_address[stp->st_addrcnt]->at_portname, "*");
- stp->st_address[stp->st_addrcnt]->at_numeric[0] = '\0';
+ stp->st_address[stp->st_addrcnt]->sat_port = 0;
+ strcpy(stp->st_address[stp->st_addrcnt]->sat_portname, "*");
+ stp->st_address[stp->st_addrcnt]->sat_numeric[0] = '\0';
stp->st_addrcnt += 1;
}
stp->st_tcpstate[0] = '\0';
@@ -743,12 +743,12 @@
stp->st_addrcnt = 0;
if (udp->ud_address_len > 0) {
stp->st_address[stp->st_addrcnt] =
- _netstat_at_allocate(stp, NETSTAT_ADDRTYPE_LOCAL,
+ _netstat_sat_allocate(stp, NETSTAT_ADDRTYPE_LOCAL,
udp->ud_address, NULL, 0);
- stp->st_address[stp->st_addrcnt]->at_port = 0;
- strcpy(stp->st_address[stp->st_addrcnt]->at_portname, "*");
- stp->st_address[stp->st_addrcnt]->at_numeric[0] = '\0';
- stp->st_addrcnt += 1;
+ stp->st_address[stp->st_addrcnt]->sat_port = 0;
+ strcpy(stp->st_address[stp->st_addrcnt]->sat_portname, "*");
+ stp->st_address[stp->st_addrcnt]->sat_numeric[0] = '\0';
+ stp->st_addrcnt += 1;
}
stp->st_tcpstate[0] = '\0';
stp->st_tcps = tcps_Invalid;
@@ -932,57 +932,57 @@
#endif
}
-struct addr_type *
+struct sockaddr_type *
extract_inet_address(struct socket_type *parent, int type, struct in_addr *in,
u_short port, int anonport)
{
- struct addr_type *result;
+ struct sockaddr_type *result;
char numeric[32];
- result = _netstat_at_allocate(parent, type, "*", (char *)in,
+ result = _netstat_sat_allocate(parent, type, "*", (char *)in,
sizeof(*in));
if (result == NULL)
return (result);
if (in->s_addr == INADDR_ANY) {
strcpy(numeric, "*");
- result->at_flags |= ADDRTYPE_NAME_RESOLVED;
+ result->sat_flags |= SOCKADDRTYPE_NAME_RESOLVED;
} else {
sprintf(numeric, "%s", inet_ntop(AF_INET, (void *)in, ntop_buf,
sizeof(ntop_buf)));
}
- strlcpy(result->at_numeric, numeric, sizeof(result->at_numeric));
- result->at_port = ntohs(port);
+ strlcpy(result->sat_numeric, numeric, sizeof(result->sat_numeric));
+ result->sat_port = ntohs(port);
if (anonport)
- result->at_flags |= ADDRTYPE_ANONPORT;
+ result->sat_flags |= SOCKADDRTYPE_ANONPORT;
return (result);
}
-struct addr_type *
+struct sockaddr_type *
extract_inet6_address(struct socket_type *parent, int type,
struct in6_addr *in, u_short port)
{
- struct addr_type *result;
+ struct sockaddr_type *result;
char numeric[32];
- result = _netstat_at_allocate(parent, type, "*", (char *)in,
+ result = _netstat_sat_allocate(parent, type, "*", (char *)in,
sizeof(*in));
if (result == NULL)
return (result);
if (IN6_IS_ADDR_UNSPECIFIED(in)) {
strcpy(numeric, "*");
- result->at_flags |= ADDRTYPE_NAME_RESOLVED;
+ result->sat_flags |= SOCKADDRTYPE_NAME_RESOLVED;
} else
sprintf(numeric, "%s", inet_ntop(AF_INET6, (void *)in,
ntop_buf6, sizeof(ntop_buf6)));
- strlcpy(result->at_numeric, numeric, sizeof(result->at_numeric));
- result->at_port = ntohs(port);
+ strlcpy(result->sat_numeric, numeric, sizeof(result->sat_numeric));
+ result->sat_port = ntohs(port);
return (result);
}
void
-_netstat_at_resolve_name(struct addr_type *addr)
+_netstat_sat_resolve_name(struct sockaddr_type *addr)
{
struct hostent *hp;
struct netent *np;
@@ -992,9 +992,9 @@
char *cp = NULL;
char domain[MAXHOSTNAMELEN];
- switch (addr->at_parent->st_family) {
+ switch (addr->sat_parent->st_family) {
case PF_INET:
- in = (struct in_addr *)addr->at_address;
+ in = (struct in_addr *)addr->sat_address;
net = inet_netof(*in);
lna = inet_lnaof(*in);
if (lna == INADDR_ANY) {
@@ -1010,14 +1010,14 @@
}
}
if (cp != NULL)
- strlcpy(addr->at_name, cp, sizeof(addr->at_name));
+ strlcpy(addr->sat_name, cp, sizeof(addr->sat_name));
else
- strlcpy(addr->at_name, addr->at_numeric,
- sizeof(addr->at_name));
- addr->at_flags |= ADDRTYPE_NAME_RESOLVED;
+ strlcpy(addr->sat_name, addr->sat_numeric,
+ sizeof(addr->sat_name));
+ addr->sat_flags |= SOCKADDRTYPE_NAME_RESOLVED;
break;
case PF_INET6:
- in6 = (struct in6_addr *)addr->at_address;
+ in6 = (struct in6_addr *)addr->sat_address;
if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
(cp = index(domain, '.')))
strcpy(domain, cp + 1);
@@ -1034,30 +1034,30 @@
}
}
if (cp != NULL)
- strlcpy(addr->at_name, cp, sizeof(addr->at_name));
+ strlcpy(addr->sat_name, cp, sizeof(addr->sat_name));
else
- strlcpy(addr->at_name, addr->at_numeric,
- sizeof(addr->at_name));
- addr->at_flags |= ADDRTYPE_NAME_RESOLVED;
+ strlcpy(addr->sat_name, addr->sat_numeric,
+ sizeof(addr->sat_name));
+ addr->sat_flags |= SOCKADDRTYPE_NAME_RESOLVED;
break;
}
}
void
-_netstat_at_resolve_portname(struct addr_type *addr)
+_netstat_sat_resolve_portname(struct sockaddr_type *addr)
{
struct servent *sp = NULL;
- if ((addr->at_port == 0) ||
- ((addr->at_flags & ADDRTYPE_ANONPORT) != 0)) {
- sprintf(addr->at_portname, "%.15s", "*");
+ if ((addr->sat_port == 0) ||
+ ((addr->sat_flags & SOCKADDRTYPE_ANONPORT) != 0)) {
+ sprintf(addr->sat_portname, "%.15s", "*");
} else {
- sp = getservbyport((int)htons(addr->at_port),
- addr->at_parent->st_name);
+ sp = getservbyport((int)htons(addr->sat_port),
+ addr->sat_parent->st_name);
if (sp != NULL)
- sprintf(addr->at_portname, "%.15s", sp->s_name);
+ sprintf(addr->sat_portname, "%.15s", sp->s_name);
else
- sprintf(addr->at_portname, "%d", addr->at_port);
+ sprintf(addr->sat_portname, "%d", addr->sat_port);
}
- addr->at_flags |= ADDRTYPE_PORT_RESOLVED;
+ addr->sat_flags |= SOCKADDRTYPE_PORT_RESOLVED;
}
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#31 (text+ko) ====
@@ -189,7 +189,7 @@
int i;
for (i = 0; i < stp->st_addrcnt; i++)
- netstat_at_free(stp->st_address[i]);
+ netstat_sat_free(stp->st_address[i]);
free(stp);
}
@@ -309,40 +309,40 @@
free(iterator);
}
-/* Address type */
-struct addr_type *
-_netstat_at_allocate(struct socket_type *parent, int type, const char *name,
+/* Socket address type */
+struct sockaddr_type *
+_netstat_sat_allocate(struct socket_type *parent, int type, const char *name,
char *address, int addr_len)
{
- struct addr_type *atp;
+ struct sockaddr_type *satp;
- atp = malloc(sizeof(*atp));
- if (atp == NULL)
+ satp = malloc(sizeof(*satp));
+ if (satp == NULL)
return (NULL);
- bzero(atp, sizeof(*atp));
- atp->at_type = type;
- atp->at_parent = parent;
- strlcpy(atp->at_name, name, 1024);
+ bzero(satp, sizeof(*satp));
+ satp->sat_type = type;
+ satp->sat_parent = parent;
+ strlcpy(satp->sat_name, name, 1024);
if (address != NULL && addr_len > 0) {
- atp->at_address = (char *)malloc(addr_len);
- if (atp->at_address == NULL) {
- free(atp);
- atp = NULL;
+ satp->sat_address = (char *)malloc(addr_len);
+ if (satp->sat_address == NULL) {
+ free(satp);
+ satp = NULL;
} else {
- memcpy(atp->at_address, address, addr_len);
- atp->at_address_len = addr_len;
+ memcpy(satp->sat_address, address, addr_len);
+ satp->sat_address_len = addr_len;
}
}
- return (atp);
+ return (satp);
}
void
-netstat_at_free(struct addr_type *atp)
+netstat_sat_free(struct sockaddr_type *satp)
{
- if (atp->at_address != NULL)
- free(atp->at_address);
- free(atp);
+ if (satp->sat_address != NULL)
+ free(satp->sat_address);
+ free(satp);
}
/* Accessor functions. */
@@ -449,7 +449,7 @@
return (stp->st_addrcnt);
}
-struct addr_type *
+struct sockaddr_type *
netstat_st_get_address(const struct socket_type *stp,
int index)
{
@@ -461,45 +461,45 @@
}
const char *
-netstat_at_get_name(struct addr_type *atp)
+netstat_sat_get_name(struct sockaddr_type *satp)
{
- if ((atp->at_flags & ADDRTYPE_NAME_RESOLVED) == 0) {
- _netstat_at_resolve_name(atp);
+ if ((satp->sat_flags & SOCKADDRTYPE_NAME_RESOLVED) == 0) {
+ _netstat_sat_resolve_name(satp);
}
- return (atp->at_name);
+ return (satp->sat_name);
}
const char *
-netstat_at_get_numeric(const struct addr_type *atp)
+netstat_sat_get_numeric(const struct sockaddr_type *satp)
{
- return (atp->at_numeric);
+ return (satp->sat_numeric);
}
int
-netstat_at_get_address(const struct addr_type *atp, char *addr, int size)
+netstat_sat_get_address(const struct sockaddr_type *satp, char *addr, int size)
{
- if ((atp->at_address != NULL) && (addr != NULL) &&
- (atp->at_address_len <= size)) {
- memcpy(addr, atp->at_address, atp->at_address_len);
- return (atp->at_address_len);
+ if ((satp->sat_address != NULL) && (addr != NULL) &&
+ (satp->sat_address_len <= size)) {
+ memcpy(addr, satp->sat_address, satp->sat_address_len);
+ return (satp->sat_address_len);
}
return (0);
}
u_int16_t
-netstat_at_get_port(const struct addr_type *atp)
+netstat_sat_get_port(const struct sockaddr_type *satp)
{
- return (atp->at_port);
+ return (satp->sat_port);
}
const char *
-netstat_at_get_portname(struct addr_type *atp)
+netstat_sat_get_portname(struct sockaddr_type *satp)
{
- if ((atp->at_flags & ADDRTYPE_PORT_RESOLVED) == 0) {
- _netstat_at_resolve_portname(atp);
+ if ((satp->sat_flags & SOCKADDRTYPE_PORT_RESOLVED) == 0) {
+ _netstat_sat_resolve_portname(satp);
}
- return (atp->at_portname);
+ return (satp->sat_portname);
}
u_int32_t
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#23 (text+ko) ====
@@ -96,7 +96,7 @@
#ifdef INET6
static int udp_done, tcp_done;
#endif /* INET6 */
-void addr_print(struct addr_type *atp, const char *proto, int numeric);
+void addr_print(struct sockaddr_type *satp, const char *proto, int numeric);
/*
* Print a summary of connections related to an Internet
@@ -158,7 +158,7 @@
{
static int first = 1;
char buf1[15];
- struct addr_type *laddr, *faddr;
+ struct sockaddr_type *laddr, *faddr;
if (first) {
if (!Lflag) {
@@ -213,7 +213,7 @@
if (!Lflag) {
addr_print(faddr, netstat_st_get_name(stp),
numeric_port ||
- netstat_at_get_port(laddr) != netstat_at_get_port(faddr));
+ netstat_sat_get_port(laddr) != netstat_sat_get_port(faddr));
}
if (xflag) {
if (Lflag)
@@ -924,19 +924,19 @@
}
void
-addr_print(struct addr_type *atp, const char *proto, int numeric)
+addr_print(struct sockaddr_type *satp, const char *proto, int numeric)
{
int width;
char line[80], *cp;
sprintf(line, "%.*s.", Wflag ? 39 : (Aflag && !numeric) ? 12 : 16,
- numeric_addr ? netstat_at_get_numeric(atp) :
- netstat_at_get_name(atp));
+ numeric_addr ? netstat_sat_get_numeric(satp) :
+ netstat_sat_get_name(satp));
cp = index(line, '\0');
- if (numeric && (netstat_at_get_port(atp) > 0))
- sprintf(cp, "%d ", netstat_at_get_port(atp));
+ if (numeric && (netstat_sat_get_port(satp) > 0))
+ sprintf(cp, "%d ", netstat_sat_get_port(satp));
else
- sprintf(cp, "%.15s ", netstat_at_get_portname(atp));
+ sprintf(cp, "%.15s ", netstat_sat_get_portname(satp));
width = Wflag ? 45 : Aflag ? 18 : 22;
printf("%-*.*s ", width, width, line);
}
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#20 (text+ko) ====
@@ -117,7 +117,7 @@
{
static int first = 1;
char buf1[15];
- struct addr_type *addr;
+ struct sockaddr_type *addr;
if (first && !Lflag) {
printf("Active UNIX domain sockets\n");
@@ -147,7 +147,7 @@
}
if (netstat_st_get_addrcnt(stp) > 0) {
addr = netstat_st_get_address(stp, 0);
- printf(" %s", netstat_at_get_name(addr));
+ printf(" %s", netstat_sat_get_name(addr));
}
putchar('\n');
}
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/nettop/main.c#11 (text+ko) ====
@@ -111,7 +111,7 @@
struct socket_type_list *list;
struct socket_type_iterator *stip;
const struct socket_type *stp;
- struct addr_type *atp;
+ struct sockaddr_type *satp;
int row, st_flags;
st_flags = NETSTAT_SOCKET_ALL;
@@ -138,8 +138,8 @@
(u_long) netstat_st_get_refs(stp),
(u_long) netstat_st_get_reflink(stp));
if (netstat_st_get_addrcnt(stp) > 0) {
- atp = netstat_st_get_address(stp, 0);
- printw(" %s", netstat_at_get_name(atp));
+ satp = netstat_st_get_address(stp, 0);
+ printw(" %s", netstat_sat_get_name(satp));
}
}
netstat_sti_free(stip);
@@ -152,7 +152,7 @@
struct socket_type_list *list;
struct socket_type_iterator *stip;
const struct socket_type *stp;
- struct addr_type *laddr, *faddr;
+ struct sockaddr_type *laddr, *faddr;
int row, st_flags;
st_flags = NETSTAT_SOCKET_ALL;
@@ -177,10 +177,10 @@
netstat_st_get_extname(stp),
netstat_sbt_get_cc(netstat_st_get_rcv(stp)),
netstat_sbt_get_cc(netstat_st_get_snd(stp)),
- netstat_at_get_name(laddr),
- netstat_at_get_portname(laddr),
- netstat_at_get_name(faddr),
- netstat_at_get_portname(faddr),
+ netstat_sat_get_name(laddr),
+ netstat_sat_get_portname(laddr),
+ netstat_sat_get_name(faddr),
+ netstat_sat_get_portname(faddr),
netstat_st_get_tcpstate(stp));
}
netstat_sti_free(stip);
More information about the p4-projects
mailing list