From patchwork Tue Nov 11 10:51:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 418559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 25E071400D2 for ; Mon, 8 Dec 2014 13:51:59 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8F00428C17F; Mon, 8 Dec 2014 03:49:32 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, FREEMAIL_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 25F8328C178 for ; Mon, 8 Dec 2014 03:49:24 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-pd0-f175.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -8.5 Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 8 Dec 2014 03:49:23 +0100 (CET) Received: by mail-pd0-f175.google.com with SMTP id y10so4230813pdj.6 for ; Sun, 07 Dec 2014 18:51:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LD4/ZhReuIWmEmn14BnroUlUYBEW5peuOO7hcNjjxTs=; b=KAEa/q1RJ8HaKtJmDx1qoYQfK7IirpWTfPkXGizGJAJ2MYHRZFRixacBl2rmJJE8ET 97QWBWIs4bFCoVUOlumLDuJeaeewJpIvsRl+RekHyUmir/mAGdfsuN+aDXM7TKL9xvk+ lQJ7rvjn8JD8FyzltEucg/t5iUu3BPBK95IOYGsspU8BGAscxhoVdqIrSCCDXeaWGYzK ihc7p0+fNIp7Wg/2lXqxgrP4TYWDeqp7YIdCxyjq5/QQjmwAmzE64jwZSaV7D8O9org7 QLSED+i9A4/JKapk2n43G4rTRabOO5UchFzyZupyO0XAUcySUpZ6T3j07W/W7kND+jDu uE0w== X-Received: by 10.70.47.195 with SMTP id f3mr16501809pdn.156.1418007063326; Sun, 07 Dec 2014 18:51:03 -0800 (PST) Received: from debian.lan ([103.29.140.56]) by mx.google.com with ESMTPSA id fn5sm34940623pdb.55.2014.12.07.18.50.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Dec 2014 18:51:02 -0800 (PST) From: Yousong Zhou To: openwrt-devel@lists.openwrt.org Date: Tue, 11 Nov 2014 18:51:31 +0800 Message-Id: <1415703092-46458-4-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415703092-46458-1-git-send-email-yszhou4tech@gmail.com> References: <1415703092-46458-1-git-send-email-yszhou4tech@gmail.com> Subject: [OpenWrt-Devel] [PATCH 4/5] ustream: add function ustream_fill_with_read_buf(). X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Useful in the following use pattern. int available = ustream_pending_data(s, false); if (available >= sizeof(struct msghdr)) { struct msghdr h; ustream_fill_with_read_buf(s, &h, sizeof(h)); } Signed-off-by: Yousong Zhou --- ustream.c | 24 ++++++++++++++++++++++++ ustream.h | 5 +++++ 2 files changed, 29 insertions(+) diff --git a/ustream.c b/ustream.c index 828a025..64cdc6a 100644 --- a/ustream.c +++ b/ustream.c @@ -333,6 +333,30 @@ char *ustream_get_read_buf(struct ustream *s, int *buflen) return data; } +int ustream_fill_with_read_buf(struct ustream *s, char *buf, int buflen) +{ + int len = 0; + int chunk_len; + struct ustream_buf *sbuf; + + if (!s->r.head) { + return 0; + } + + sbuf = s->r.head; + do { + chunk_len = sbuf->tail - sbuf->data; + if (chunk_len > buflen) + chunk_len = buflen; + memcpy(&buf[len], sbuf->data, chunk_len); + buflen -= chunk_len; + len += chunk_len; + sbuf = sbuf->next; + } while (buflen && sbuf); + + return len; +} + static void ustream_write_error(struct ustream *s) { if (!s->write_error) diff --git a/ustream.h b/ustream.h index 6431744..48dfa67 100644 --- a/ustream.h +++ b/ustream.h @@ -150,6 +150,11 @@ int ustream_vprintf(struct ustream *s, const char *format, va_list arg); /* ustream_get_read_buf: get a pointer to the next read buffer data */ char *ustream_get_read_buf(struct ustream *s, int *buflen); +/* + * ustream_fill_with_read_buf: fill buf with read buffer data and return + * size of actual data written. + :*/ +int ustream_fill_with_read_buf(struct ustream *s, char *buf, int buflen); /* * ustream_set_read_blocked: set read blocked state