svn commit: r263420 - in projects/sendfile/usr.bin: bluetooth/btsockstat netstat systat
Gleb Smirnoff
glebius at FreeBSD.org
Thu Mar 20 09:20:38 UTC 2014
Author: glebius
Date: Thu Mar 20 09:20:37 2014
New Revision: 263420
URL: http://svnweb.freebsd.org/changeset/base/263420
Log:
Fix several build breakages due to sb_cc disappear.
Modified:
projects/sendfile/usr.bin/bluetooth/btsockstat/btsockstat.c
projects/sendfile/usr.bin/netstat/inet.c
projects/sendfile/usr.bin/netstat/netgraph.c
projects/sendfile/usr.bin/netstat/unix.c
projects/sendfile/usr.bin/systat/netstat.c
Modified: projects/sendfile/usr.bin/bluetooth/btsockstat/btsockstat.c
==============================================================================
--- projects/sendfile/usr.bin/bluetooth/btsockstat/btsockstat.c Thu Mar 20 06:22:39 2014 (r263419)
+++ projects/sendfile/usr.bin/bluetooth/btsockstat/btsockstat.c Thu Mar 20 09:20:37 2014 (r263420)
@@ -255,8 +255,8 @@ hcirawpr(kvm_t *kvmd, u_long addr)
(unsigned long) pcb.so,
(unsigned long) this,
pcb.flags,
- so.so_rcv.sb_cc,
- so.so_snd.sb_cc,
+ so.so_rcv.sb_ccc,
+ so.so_snd.sb_ccc,
pcb.addr.hci_node);
}
} /* hcirawpr */
@@ -303,8 +303,8 @@ l2caprawpr(kvm_t *kvmd, u_long addr)
"%-8lx %-8lx %6d %6d %-17.17s\n",
(unsigned long) pcb.so,
(unsigned long) this,
- so.so_rcv.sb_cc,
- so.so_snd.sb_cc,
+ so.so_rcv.sb_ccc,
+ so.so_snd.sb_ccc,
bdaddrpr(&pcb.src, NULL, 0));
}
} /* l2caprawpr */
@@ -361,8 +361,8 @@ l2cappr(kvm_t *kvmd, u_long addr)
fprintf(stdout,
"%-8lx %6d %6d %-17.17s/%-5d %-17.17s %-5d %s\n",
(unsigned long) this,
- so.so_rcv.sb_cc,
- so.so_snd.sb_cc,
+ so.so_rcv.sb_ccc,
+ so.so_snd.sb_ccc,
bdaddrpr(&pcb.src, local, sizeof(local)),
pcb.psm,
bdaddrpr(&pcb.dst, remote, sizeof(remote)),
@@ -467,8 +467,8 @@ rfcommpr(kvm_t *kvmd, u_long addr)
fprintf(stdout,
"%-8lx %6d %6d %-17.17s %-17.17s %-4d %-4d %s\n",
(unsigned long) this,
- so.so_rcv.sb_cc,
- so.so_snd.sb_cc,
+ so.so_rcv.sb_ccc,
+ so.so_snd.sb_ccc,
bdaddrpr(&pcb.src, local, sizeof(local)),
bdaddrpr(&pcb.dst, remote, sizeof(remote)),
pcb.channel,
Modified: projects/sendfile/usr.bin/netstat/inet.c
==============================================================================
--- projects/sendfile/usr.bin/netstat/inet.c Thu Mar 20 06:22:39 2014 (r263419)
+++ projects/sendfile/usr.bin/netstat/inet.c Thu Mar 20 09:20:37 2014 (r263420)
@@ -137,7 +137,7 @@ pcblist_sysctl(int proto, const char *na
static void
sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb)
{
- xsb->sb_cc = sb->sb_cc;
+ xsb->sb_cc = sb->sb_ccc;
xsb->sb_hiwat = sb->sb_hiwat;
xsb->sb_mbcnt = sb->sb_mbcnt;
xsb->sb_mcnt = sb->sb_mcnt;
@@ -476,7 +476,8 @@ protopr(u_long off, const char *name, in
printf("%6u %6u %6u ", tp->t_sndrexmitpack,
tp->t_rcvoopack, tp->t_sndzerowin);
} else {
- printf("%6u %6u ", so->so_rcv.sb_cc, so->so_snd.sb_cc);
+ printf("%6u %6u ",
+ so->so_rcv.sb_cc, so->so_snd.sb_cc);
}
if (numeric_port) {
if (inp->inp_vflag & INP_IPV4) {
Modified: projects/sendfile/usr.bin/netstat/netgraph.c
==============================================================================
--- projects/sendfile/usr.bin/netstat/netgraph.c Thu Mar 20 06:22:39 2014 (r263419)
+++ projects/sendfile/usr.bin/netstat/netgraph.c Thu Mar 20 09:20:37 2014 (r263420)
@@ -119,7 +119,7 @@ netgraphprotopr(u_long off, const char *
if (Aflag)
printf("%8lx ", (u_long) this);
printf("%-5.5s %6u %6u ",
- name, sockb.so_rcv.sb_cc, sockb.so_snd.sb_cc);
+ name, sockb.so_rcv.sb_ccc, sockb.so_snd.sb_ccc);
/* Get info on associated node */
if (ngpcb.node_id == 0 || csock == -1)
Modified: projects/sendfile/usr.bin/netstat/unix.c
==============================================================================
--- projects/sendfile/usr.bin/netstat/unix.c Thu Mar 20 06:22:39 2014 (r263419)
+++ projects/sendfile/usr.bin/netstat/unix.c Thu Mar 20 09:20:37 2014 (r263420)
@@ -287,7 +287,8 @@ unixdomainpr(struct xunpcb *xunp, struct
} else {
printf("%8lx %-6.6s %6u %6u %8lx %8lx %8lx %8lx",
(long)so->so_pcb, socktype[so->so_type], so->so_rcv.sb_cc,
- so->so_snd.sb_cc, (long)unp->unp_vnode, (long)unp->unp_conn,
+ so->so_snd.sb_cc, (long)unp->unp_vnode,
+ (long)unp->unp_conn,
(long)LIST_FIRST(&unp->unp_refs),
(long)LIST_NEXT(unp, unp_reflink));
}
Modified: projects/sendfile/usr.bin/systat/netstat.c
==============================================================================
--- projects/sendfile/usr.bin/systat/netstat.c Thu Mar 20 06:22:39 2014 (r263419)
+++ projects/sendfile/usr.bin/systat/netstat.c Thu Mar 20 09:20:37 2014 (r263420)
@@ -333,8 +333,8 @@ enter_kvm(struct inpcb *inp, struct sock
struct netinfo *p;
if ((p = enter(inp, state, proto)) != NULL) {
- p->ni_rcvcc = so->so_rcv.sb_cc;
- p->ni_sndcc = so->so_snd.sb_cc;
+ p->ni_rcvcc = so->so_rcv.sb_ccc;
+ p->ni_sndcc = so->so_snd.sb_ccc;
}
}
More information about the svn-src-projects
mailing list