From patchwork Fri Feb 23 11:12:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eyal Birger X-Patchwork-Id: 877041 X-Patchwork-Delegate: dsahern@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="E/xeADR+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3znpVN3s7nz9sWJ for ; Fri, 23 Feb 2018 22:13:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbeBWLM6 (ORCPT ); Fri, 23 Feb 2018 06:12:58 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:39044 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbeBWLMz (ORCPT ); Fri, 23 Feb 2018 06:12:55 -0500 Received: by mail-wm0-f65.google.com with SMTP id 191so3892353wmm.4 for ; Fri, 23 Feb 2018 03:12:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5lZYCCdXG51ivIwkbHMkIUGfnFbZomQfwQ8w0iuLZCo=; b=E/xeADR+VaqJjvZnrSl2/AxCl+EUDoU0wSnTtpiJ8UnmUSq9jlDFV1UY1lII1dOfmw 3PFWcSoXml3phWWB5tlVMF7QpR5TxAy/z+5tnwdTp8c5C+hgHDGVQIwAXOfgL3S+s4R4 CEyqgsoBxoWU7OQxGacDlYgMFUs1vp+ZjS3Nep81cccXDOPl6qncIixKSpT/die942pz wwJtEdq2Z+yXnP/bQemf2KzqqVhEybkK2Gz0TErW49W08ZfQ4E/AF19TTkeECr/gY++h aw7Tf881veX8k+G3KMx7w1mIIR3JtB4i6V2lu3/KCguIZQQQZOKdrCdwLGy72rxmEUWZ V2aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5lZYCCdXG51ivIwkbHMkIUGfnFbZomQfwQ8w0iuLZCo=; b=TC5fxrEe86AdjUwvd1+EvZ3Vr8xl2SlxqipLpDZ1O1Fj8uekVDUccg790TSxcbWckD FxvIaT6e9JuCrEnAkwc3AOR7zRgTx3Q63Ro9iheNifmBwzEwi6+VNcn8UBkZPSJTa90w ifz48444fkrfE1gHnPbr8TFGuEQejgI9ysnlW5GL5SolLXYqF1Wq1POFpOwbOmZ5I5pp Az42yBXMCtTteURacSIU5rsl6eT2ufsCQp0IOoe2FBoxJm+5b1oQZkvS9TP7PC1hY7pD uhbQTk5vWMPjKo3W53rlp9B9x8MT8cr9d8izZJPToOp5051g5fY4h6/SXZrUlCA8yKan uEQg== X-Gm-Message-State: APf1xPA+OmM5bRPba36gGW2pY3V5pbC2PFpYWK0vseOoVY/hRF+hF/d1 ycH4ja2xg2x+AyKYpNkqdUDnISjb X-Google-Smtp-Source: AH8x224kMsKpzNAzTDWo7tI6m2Yd8ZIlOmitxVt1JtlnELy4UrprUwZ0ubjLKXZs7Uj1val20bPGcw== X-Received: by 10.28.134.75 with SMTP id i72mr1464194wmd.160.1519384373970; Fri, 23 Feb 2018 03:12:53 -0800 (PST) Received: from localhost.localdomain (85.65.196.133.dynamic.barak-online.net. [85.65.196.133]) by smtp.gmail.com with ESMTPSA id 137sm5643871wml.3.2018.02.23.03.12.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Feb 2018 03:12:53 -0800 (PST) From: Eyal Birger To: netdev@vger.kernel.org Cc: dsahern@gmail.com, shmulik@metanetworks.com, Eyal Birger Subject: [PATCH iproute2-next 1/2] tc: ematch: add parse_eopt_argv() method for providing ematches with argv parameters Date: Fri, 23 Feb 2018 13:12:24 +0200 Message-Id: <1519384345-17115-2-git-send-email-eyal.birger@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519384345-17115-1-git-send-email-eyal.birger@gmail.com> References: <1519384345-17115-1-git-send-email-eyal.birger@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ematche uses YACC to parse ematch arguments and places them in struct bstr linked lists. It is useful to be able to receive parameters as argc,argv in order to use getopt (and alike) argument parsers. Signed-off-by: Eyal Birger --- tc/m_ematch.c | 27 ++++++++++++++++++++++++++- tc/m_ematch.h | 2 ++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/tc/m_ematch.c b/tc/m_ematch.c index 7dbc2e7..61f8fb3 100644 --- a/tc/m_ematch.c +++ b/tc/m_ematch.c @@ -169,6 +169,31 @@ static struct ematch_util *get_ematch_kind_num(__u16 kind) return get_ematch_kind(name); } +static int em_parse_call(struct nlmsghdr *n, struct tcf_ematch_hdr *hdr, + struct ematch_util *e, struct ematch *t) +{ + if (e->parse_eopt_argv) { + int argc = 0, i = 0, ret; + struct bstr *args; + char **argv; + + for (args = t->args; args; args = bstr_next(args)) + argc++; + argv = calloc(argc, sizeof(char *)); + if (!argv) + return -1; + for (args = t->args; args; args = bstr_next(args)) + argv[i++] = args->data; + + ret = e->parse_eopt_argv(n, hdr, argc, argv); + + free(argv); + return ret; + } + + return e->parse_eopt(n, hdr, t->args->next); +} + static int parse_tree(struct nlmsghdr *n, struct ematch *tree) { int index = 1; @@ -212,7 +237,7 @@ static int parse_tree(struct nlmsghdr *n, struct ematch *tree) } hdr.kind = num; - if (e->parse_eopt(n, &hdr, t->args->next) < 0) + if (em_parse_call(n, &hdr, e, t) < 0) return -1; } diff --git a/tc/m_ematch.h b/tc/m_ematch.h index fa6e214..f634f19 100644 --- a/tc/m_ematch.h +++ b/tc/m_ematch.h @@ -88,6 +88,8 @@ struct ematch_util int kind_num; int (*parse_eopt)(struct nlmsghdr *,struct tcf_ematch_hdr *, struct bstr *); + int (*parse_eopt_argv)(struct nlmsghdr *, struct tcf_ematch_hdr *, + int, char **); int (*print_eopt)(FILE *, struct tcf_ematch_hdr *, void *, int); void (*print_usage)(FILE *); struct ematch_util *next;