PERFORCE change 165118 for review
Gabor Pali
pgj at FreeBSD.org
Wed Jun 24 22:47:34 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=165118
Change 165118 by pgj at petymeg-current on 2009/06/24 22:47:01
- Standardize witdh of properties for connections
- Modify applications to follow the change
Affected files ...
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#34 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#21 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#19 edit
.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#21 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#20 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#16 edit
.. //depot/projects/soc2009/pgj_libstat/src/usr.bin/nettop/main.c#6 edit
Differences ...
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#34 (text+ko) ====
@@ -643,10 +643,10 @@
stp->st_rcv.sbt_mbmax = so->so_rcv.sb_mbmax;
stp->st_pcb = (tp == NULL) ? (u_long)inp->inp_ppcb :
(u_long)so->so_pcb;
- stp->st_vnode = (u_long)0;
- stp->st_conn = (u_long)0;
- stp->st_refs = (u_long)0;
- stp->st_reflink = (u_long)0;
+ stp->st_vnode = 0;
+ stp->st_conn = 0;
+ stp->st_refs = 0;
+ stp->st_reflink = 0;
stp->st_flags = 0;
stp->st_addrcnt = 0;
if (tp != NULL) {
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#21 (text+ko) ====
@@ -64,14 +64,14 @@
const char *netstat_st_get_extname(const struct socket_type *stp);
const struct sockbuf_type *netstat_st_get_snd(const struct socket_type *stp);
const struct sockbuf_type *netstat_st_get_rcv(const struct socket_type *stp);
-u_short netstat_st_get_qlen(const struct socket_type *stp);
-u_short netstat_st_get_incqlen(const struct socket_type *stp);
-u_short netstat_st_get_qlimit(const struct socket_type *stp);
-u_long netstat_st_get_pcb(const struct socket_type *stp);
-u_long netstat_st_get_vnode(const struct socket_type *stp);
-u_long netstat_st_get_conn(const struct socket_type *stp);
-u_long netstat_st_get_refs(const struct socket_type *stp);
-u_long netstat_st_get_reflink(const struct socket_type *stp);
+uint16_t netstat_st_get_qlen(const struct socket_type *stp);
+uint16_t netstat_st_get_incqlen(const struct socket_type *stp);
+uint16_t netstat_st_get_qlimit(const struct socket_type *stp);
+u_int64_t netstat_st_get_pcb(const struct socket_type *stp);
+u_int64_t netstat_st_get_vnode(const struct socket_type *stp);
+u_int64_t netstat_st_get_conn(const struct socket_type *stp);
+u_int64_t netstat_st_get_refs(const struct socket_type *stp);
+u_int64_t netstat_st_get_reflink(const struct socket_type *stp);
const char *netstat_st_get_tcpstate(const struct socket_type *stp);
/* Addresses: */
int netstat_st_get_addrcnt(const struct socket_type *stp);
@@ -82,16 +82,16 @@
const char *netstat_at_get_numeric(const struct addr_type *atp);
int netstat_at_get_address(const struct addr_type *atp,
char *addr, int addr_len);
-u_short netstat_at_get_port(const struct addr_type *atp);
+uint16_t netstat_at_get_port(const struct addr_type *atp);
const char *netstat_at_get_portname(struct addr_type *atp);
/* Socket buffers: */
-u_int netstat_sbt_get_cc(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_lowat(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp);
-u_int netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_cc(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_lowat(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp);
+u_int32_t netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp);
__END_DECLS
#endif /* !_NETSTAT_H_ */
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#19 (text+ko) ====
@@ -28,19 +28,19 @@
char at_numeric[32];
char *at_address;
int at_address_len;
- u_short at_port;
+ uint16_t at_port;
char at_portname[32];
};
/* Socket buffer type */
struct sockbuf_type {
- u_int sbt_cc; /* actual chars in the buffer */
- u_int sbt_mcnt;
- u_int sbt_ccnt;
- u_int sbt_hiwat;
- u_int sbt_lowat;
- u_int sbt_mbcnt;
- u_int sbt_mbmax;
+ u_int32_t sbt_cc; /* actual chars in the buffer */
+ u_int32_t sbt_mcnt;
+ u_int32_t sbt_ccnt;
+ u_int32_t sbt_hiwat;
+ u_int32_t sbt_lowat;
+ u_int32_t sbt_mbcnt;
+ u_int32_t sbt_mbmax;
};
/* internal defines for addr_type: */
@@ -73,15 +73,15 @@
struct sockbuf_type st_snd;
struct sockbuf_type st_rcv;
- u_short st_qlen; /* number of unaccepted connections */
- u_short st_incqlen; /* number of unaccepted incomplete
+ uint16_t st_qlen; /* number of unaccepted connections */
+ uint16_t st_incqlen; /* number of unaccepted incomplete
connections */
- u_short st_qlimit; /* max number queued connections */
- u_long st_pcb; /* protocol control block */
- u_long st_vnode; /* if associated with file */
- u_long st_conn; /* control block of connected socket */
- u_long st_refs; /* referencing socket linked list */
- u_long st_reflink; /* link in references list */
+ uint16_t st_qlimit; /* max number queued connections */
+ u_int64_t st_pcb; /* protocol control block */
+ u_int64_t st_vnode; /* if associated with file */
+ u_int64_t st_conn; /* control block of connected socket */
+ u_int64_t st_refs; /* referencing socket linked list */
+ u_int64_t st_reflink; /* link in references list */
char st_tcpstate[16];
/* list of types */
==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#21 (text+ko) ====
@@ -362,49 +362,49 @@
return (&stp->st_rcv);
}
-u_short
+u_int16_t
netstat_st_get_qlen(const struct socket_type *stp)
{
return (stp->st_qlen);
}
-u_short
+u_int16_t
netstat_st_get_incqlen(const struct socket_type *stp)
{
return (stp->st_incqlen);
}
-u_short
+u_int16_t
netstat_st_get_qlimit(const struct socket_type *stp)
{
return (stp->st_qlimit);
}
-u_long
+u_int64_t
netstat_st_get_pcb(const struct socket_type *stp)
{
return (stp->st_pcb);
}
-u_long
+u_int64_t
netstat_st_get_vnode(const struct socket_type *stp)
{
return (stp->st_vnode);
}
-u_long
+u_int64_t
netstat_st_get_conn(const struct socket_type *stp)
{
return (stp->st_conn);
}
-u_long
+u_int64_t
netstat_st_get_refs(const struct socket_type *stp)
{
return (stp->st_refs);
}
-u_long
+u_int64_t
netstat_st_get_reflink(const struct socket_type *stp)
{
return (stp->st_reflink);
@@ -461,7 +461,7 @@
return (0);
}
-u_short
+u_int16_t
netstat_at_get_port(const struct addr_type *atp)
{
return (atp->at_port);
@@ -476,43 +476,43 @@
return (atp->at_portname);
}
-u_int
+u_int32_t
netstat_sbt_get_cc(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_cc);
}
-u_int
+u_int32_t
netstat_sbt_get_hiwat(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_hiwat);
}
-u_int
+u_int32_t
netstat_sbt_get_lowat(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_lowat);
}
-u_int
+u_int32_t
netstat_sbt_get_mbcnt(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_mbcnt);
}
-u_int
+u_int32_t
netstat_sbt_get_mcnt(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_mcnt);
}
-u_int
+u_int32_t
netstat_sbt_get_ccnt(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_ccnt);
}
-u_int
+u_int32_t
netstat_sbt_get_mbmax(const struct sockbuf_type *sbtp)
{
return (sbtp->sbt_mbmax);
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#20 (text+ko) ====
@@ -196,7 +196,7 @@
if (Lflag && netstat_st_get_qlimit(stp) == 0)
return;
if (Aflag)
- printf("%8lx ", netstat_st_get_pcb(stp));
+ printf("%8lx ", (u_long) netstat_st_get_pcb(stp));
printf("%-5.5s ", netstat_st_get_extname(stp));
if (Lflag) {
snprintf(buf1, 15, "%d/%d/%d", netstat_st_get_qlen(stp),
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#16 (text+ko) ====
@@ -135,11 +135,13 @@
printf("unix %-14.14s", buf1);
} else {
printf("%8lx %-6.6s %6u %6u %8lx %8lx %8lx %8lx",
- netstat_st_get_pcb(stp), netstat_st_get_name(stp),
+ (u_long) netstat_st_get_pcb(stp), netstat_st_get_name(stp),
netstat_sbt_get_cc(netstat_st_get_rcv(stp)),
netstat_sbt_get_cc(netstat_st_get_snd(stp)),
- netstat_st_get_vnode(stp), netstat_st_get_conn(stp),
- netstat_st_get_refs(stp), netstat_st_get_reflink(stp));
+ (u_long) netstat_st_get_vnode(stp),
+ (u_long) netstat_st_get_conn(stp),
+ (u_long) netstat_st_get_refs(stp),
+ (u_long) netstat_st_get_reflink(stp));
}
if (netstat_st_get_addrcnt(stp) > 0) {
addr = netstat_st_get_address(stp, 0);
==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/nettop/main.c#6 (text+ko) ====
@@ -77,11 +77,13 @@
stp = netstat_sti_next(stip), row++) {
mvprintw(row, 0,
"%8lx %-6.6s %6u %6u %8lx %8lx %8lx %8lx",
- netstat_st_get_pcb(stp), netstat_st_get_name(stp),
+ (u_long) netstat_st_get_pcb(stp), netstat_st_get_name(stp),
netstat_sbt_get_cc(netstat_st_get_rcv(stp)),
netstat_sbt_get_cc(netstat_st_get_snd(stp)),
- netstat_st_get_vnode(stp), netstat_st_get_conn(stp),
- netstat_st_get_refs(stp), netstat_st_get_reflink(stp));
+ (u_long) netstat_st_get_vnode(stp),
+ (u_long) netstat_st_get_conn(stp),
+ (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));
More information about the p4-projects
mailing list