From owner-svn-src-projects@FreeBSD.ORG Wed Apr 2 09:49:09 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7C99E26; Wed, 2 Apr 2014 09:49:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C409B37C; Wed, 2 Apr 2014 09:49:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s329n9sU096821; Wed, 2 Apr 2014 09:49:09 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s329n84N096814; Wed, 2 Apr 2014 09:49:08 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201404020949.s329n84N096814@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 2 Apr 2014 09:49:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r264034 - in projects/sendfile/sys: dev/iscsi netgraph/bluetooth/socket netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2014 09:49:09 -0000 Author: glebius Date: Wed Apr 2 09:49:08 2014 New Revision: 264034 URL: http://svnweb.freebsd.org/changeset/base/264034 Log: Use appropriate sbavail() or sbused() instead of access to sb_cc. Modified: projects/sendfile/sys/dev/iscsi/icl.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c projects/sendfile/sys/netinet/accf_dns.c projects/sendfile/sys/netinet/accf_http.c Modified: projects/sendfile/sys/dev/iscsi/icl.c ============================================================================== --- projects/sendfile/sys/dev/iscsi/icl.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/dev/iscsi/icl.c Wed Apr 2 09:49:08 2014 (r264034) @@ -736,7 +736,7 @@ icl_receive_thread(void *arg) } SOCKBUF_LOCK(&so->so_rcv); - available = so->so_rcv.sb_cc; + available = sbavail(&so->so_rcv); if (available < ic->ic_receive_len) { so->so_rcv.sb_lowat = ic->ic_receive_len; cv_wait(&ic->ic_receive_cv, &so->so_rcv.sb_mtx); Modified: projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c ============================================================================== --- projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c Wed Apr 2 09:49:08 2014 (r264034) @@ -1127,9 +1127,8 @@ ng_btsocket_l2cap_process_l2ca_write_rsp /* * Check if we have more data to send */ - sbdroprecord(&pcb->so->so_snd); - if (pcb->so->so_snd.sb_cc > 0) { + if (sbavail(&pcb->so->so_snd) > 0) { if (ng_btsocket_l2cap_send2(pcb) == 0) ng_btsocket_l2cap_timeout(pcb); else @@ -2510,7 +2509,7 @@ ng_btsocket_l2cap_send2(ng_btsocket_l2ca mtx_assert(&pcb->pcb_mtx, MA_OWNED); - if (pcb->so->so_snd.sb_cc == 0) + if (sbavail(&pcb->so->so_snd) == 0) return (EINVAL); /* XXX */ m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT); Modified: projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c ============================================================================== --- projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Wed Apr 2 09:49:08 2014 (r264034) @@ -3274,7 +3274,7 @@ ng_btsocket_rfcomm_pcb_send(ng_btsocket_ } for (error = 0, sent = 0; sent < limit; sent ++) { - length = min(pcb->mtu, pcb->so->so_snd.sb_cc); + length = min(pcb->mtu, sbavail(&pcb->so->so_snd)); if (length == 0) break; Modified: projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c ============================================================================== --- projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c Wed Apr 2 09:49:08 2014 (r264034) @@ -906,7 +906,7 @@ ng_btsocket_sco_default_msg_input(struct sbdroprecord(&pcb->so->so_snd); /* Send more if we have any */ - if (pcb->so->so_snd.sb_cc > 0) + if (sbavail(&pcb->so->so_snd) > 0) if (ng_btsocket_sco_send2(pcb) == 0) ng_btsocket_sco_timeout(pcb); @@ -1744,7 +1744,7 @@ ng_btsocket_sco_send2(ng_btsocket_sco_pc mtx_assert(&pcb->pcb_mtx, MA_OWNED); while (pcb->rt->pending < pcb->rt->num_pkts && - pcb->so->so_snd.sb_cc > 0) { + sbavail(&pcb->so->so_snd) > 0) { /* Get a copy of the first packet on send queue */ m = m_dup(pcb->so->so_snd.sb_mb, M_NOWAIT); if (m == NULL) { Modified: projects/sendfile/sys/netinet/accf_dns.c ============================================================================== --- projects/sendfile/sys/netinet/accf_dns.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/netinet/accf_dns.c Wed Apr 2 09:49:08 2014 (r264034) @@ -75,7 +75,7 @@ sohasdns(struct socket *so, void *arg, i struct sockbuf *sb = &so->so_rcv; /* If the socket is full, we're ready. */ - if (sb->sb_cc >= sb->sb_hiwat || sb->sb_mbcnt >= sb->sb_mbmax) + if (sbused(sb) >= sb->sb_hiwat || sb->sb_mbcnt >= sb->sb_mbmax) goto ready; /* Check to see if we have a request. */ @@ -115,14 +115,14 @@ skippacket(struct sockbuf *sb) { unsigned long packlen; struct packet q, *p = &q; - if (sb->sb_cc < 2) + if (sbavail(sb) < 2) return DNS_WAIT; q.m = sb->sb_mb; q.n = q.m->m_nextpkt; q.moff = 0; q.offset = 0; - q.len = sb->sb_cc; + q.len = sbavail(sb); GET16(p, packlen); if (packlen + 2 > q.len) Modified: projects/sendfile/sys/netinet/accf_http.c ============================================================================== --- projects/sendfile/sys/netinet/accf_http.c Wed Apr 2 09:46:00 2014 (r264033) +++ projects/sendfile/sys/netinet/accf_http.c Wed Apr 2 09:49:08 2014 (r264034) @@ -92,7 +92,7 @@ sbfull(struct sockbuf *sb) "mbcnt(%ld) >= mbmax(%ld): %d", sb->sb_cc, sb->sb_hiwat, sb->sb_cc >= sb->sb_hiwat, sb->sb_mbcnt, sb->sb_mbmax, sb->sb_mbcnt >= sb->sb_mbmax); - return (sb->sb_cc >= sb->sb_hiwat || sb->sb_mbcnt >= sb->sb_mbmax); + return (sbused(sb) >= sb->sb_hiwat || sb->sb_mbcnt >= sb->sb_mbmax); } /* @@ -162,13 +162,14 @@ static int sohashttpget(struct socket *so, void *arg, int waitflag) { - if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 && !sbfull(&so->so_rcv)) { + if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 && + !sbfull(&so->so_rcv)) { struct mbuf *m; char *cmp; int cmplen, cc; m = so->so_rcv.sb_mb; - cc = so->so_rcv.sb_cc - 1; + cc = sbavail(&so->so_rcv) - 1; if (cc < 1) return (SU_OK); switch (*mtod(m, char *)) { @@ -215,7 +216,7 @@ soparsehttpvers(struct socket *so, void goto fallout; m = so->so_rcv.sb_mb; - cc = so->so_rcv.sb_cc; + cc = sbavail(&so->so_rcv); inspaces = spaces = 0; for (m = so->so_rcv.sb_mb; m; m = n) { n = m->m_nextpkt; @@ -304,7 +305,7 @@ soishttpconnected(struct socket *so, voi * have NCHRS left */ copied = 0; - ccleft = so->so_rcv.sb_cc; + ccleft = sbavail(&so->so_rcv); if (ccleft < NCHRS) goto readmore; a = b = c = '\0';