From patchwork Mon Apr 3 06:11:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken-ichirou MATSUZAWA X-Patchwork-Id: 746285 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vxMF156S2z9s0Z for ; Mon, 3 Apr 2017 16:11:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YkoSX40j"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751303AbdDCGLc (ORCPT ); Mon, 3 Apr 2017 02:11:32 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35405 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751141AbdDCGLb (ORCPT ); Mon, 3 Apr 2017 02:11:31 -0400 Received: by mail-pg0-f67.google.com with SMTP id g2so27469889pge.2 for ; Sun, 02 Apr 2017 23:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=p+Y3XwcKKYe7M44QL3VJhaPlo1IRxQaLOd96rSxQqGg=; b=YkoSX40j+v8HzCWMFdgOgPJ8c0IobXmFoABrATIL3bajYXDkNv3+LR9GnliApT5FSy l69gtx/e5lJxgSfAuXz12CUBOpARkkHWHIFHOLgUCjePRQAJKrcafy+R6+QNWGon9cZN AafmAfGG3+TmrO7T+lmZR1VhCWqC+x1kT5bghIEpv1qpLKKB0DXm8oBPw31IIzsZb5kF /hlNZ7Je4eeIh0tBBMdI0MgE8ivuGWp5krfDHO3c3jwMr0cUg9/1qw/V2m+mC8dAwgY7 7cvD6U7sSusq6zzgzf5baGEst6EsIuwEqmbO4EByPdsxEYtox5IWByBD2owHqe60qylx WjYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=p+Y3XwcKKYe7M44QL3VJhaPlo1IRxQaLOd96rSxQqGg=; b=PrtmPGFYlGtfs//kFSnqns5Oxs5f5Y8nf61FTRZpFE6+cokUe+lsGR6H9K8u35PBEa GBUQLDvUIzKSfjyF0P7ZITaNnArW26PeLQwp5gYcSYC45DEqklSqYmEibBy5GIfujEFG YDnR6vg6UlrYCMqLhcVt8lcKZ3qakBwYWgf9YZcpJPNxVSOehc/X2rkoZ+bx9SgZWxmx NDb8GRigsZLU7smGTFZJmC4tXVQfWgU7phSMG/kBC/48Dp4DXcwUo3lSIa7vhur9caWj nXgCxODkVNxp4GU8tJk9cf3XCEoeXbdTmGRQU8dgy9u+a946tFynywUS9MmYaO7mysJd y8ZQ== X-Gm-Message-State: AFeK/H2zQrOWYRoPMJ0PVhmVviLxCTCKfNZEvVDbylHhMoYxf2B7jWfkRLJFDjwf5s1ezA== X-Received: by 10.98.53.7 with SMTP id c7mr15928749pfa.175.1491199891017; Sun, 02 Apr 2017 23:11:31 -0700 (PDT) Received: from gmail.com (softbank218138040024.bbtec.net. [218.138.40.24]) by smtp.gmail.com with ESMTPSA id w129sm23122319pfb.130.2017.04.02.23.11.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 Apr 2017 23:11:30 -0700 (PDT) Date: Mon, 3 Apr 2017 15:11:27 +0900 From: Ken-ichirou MATSUZAWA To: The netfilter developer mailinglist Subject: [PATCH libmnl] nlmsg: introduce mnl_nlmsg_batch_rest to get the rest length Message-ID: <20170403061127.GA2329@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Recent languages implements array to hold its length. This patch enables to help to wrap these. As of this C library, we can use this like below without double sized buffer. char buf[MNL_SOCKET_BUFFER_SIZE]; b = mnl_nlmsg_batch_start(buf, sizeof(buf)); nlbuf = mnl_nlmsg_batch_current(b); rest = mnl_nlmsg_batch_rest(b); if (rest < NLMSG_HDRLEN) return false; nlh = mnl_nlmsg_put_header(nlbuf); ... if (!mnl_attr_put_u8_check(nlh, rest, 1, 2)) return false; ... Signed-off-by: Ken-ichirou MATSUZAWA --- include/libmnl/libmnl.h | 1 + src/libmnl.map | 4 ++++ src/nlmsg.c | 12 ++++++++++++ 3 files changed, 17 insertions(+) diff --git a/include/libmnl/libmnl.h b/include/libmnl/libmnl.h index 0331da7..8cfe137 100644 --- a/include/libmnl/libmnl.h +++ b/include/libmnl/libmnl.h @@ -76,6 +76,7 @@ extern void mnl_nlmsg_batch_reset(struct mnl_nlmsg_batch *b); extern void *mnl_nlmsg_batch_head(struct mnl_nlmsg_batch *b); extern void *mnl_nlmsg_batch_current(struct mnl_nlmsg_batch *b); extern bool mnl_nlmsg_batch_is_empty(struct mnl_nlmsg_batch *b); +extern size_t mnl_nlmsg_batch_rest(const struct mnl_nlmsg_batch *b); /* * Netlink attributes API diff --git a/src/libmnl.map b/src/libmnl.map index e5920e5..97b31d7 100644 --- a/src/libmnl.map +++ b/src/libmnl.map @@ -77,3 +77,7 @@ LIBMNL_1.2 { mnl_socket_open2; mnl_socket_fdopen; } LIBMNL_1.1; + +LIBMNL_1.3 { + mnl_nlmsg_batch_rest; +} LIBMNL_1.2; diff --git a/src/nlmsg.c b/src/nlmsg.c index f9448a5..614e434 100644 --- a/src/nlmsg.c +++ b/src/nlmsg.c @@ -562,5 +562,17 @@ bool mnl_nlmsg_batch_is_empty(struct mnl_nlmsg_batch *b) } /** + * mnl_nlmsg_batch_rest - get the rest of the batch buffer size + * \param b pointer to batch + * + * This function returns the rest of the batch buffer size + */ +EXPORT_SYMBOL(mnl_nlmsg_batch_rest); +size_t mnl_nlmsg_batch_rest(const struct mnl_nlmsg_batch *b) +{ + return b->limit - b->buflen; +} + +/** * @} */