From patchwork Fri Jun 21 14:42:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 253235 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 D2FEE2C008C for ; Sat, 22 Jun 2013 00:42:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422893Ab3FUOme (ORCPT ); Fri, 21 Jun 2013 10:42:34 -0400 Received: from mail.us.es ([193.147.175.20]:41723 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161517Ab3FUOmb (ORCPT ); Fri, 21 Jun 2013 10:42:31 -0400 Received: (qmail 739 invoked from network); 21 Jun 2013 16:42:29 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 21 Jun 2013 16:42:29 +0200 Received: (qmail 2899 invoked by uid 507); 21 Jun 2013 14:42:29 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.97.8/17391. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.8/7.5):. Processed in 1.917799 secs); 21 Jun 2013 14:42:29 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.8 required=7.5 tests=BAYES_50,RCVD_IN_PBL, RCVD_IN_RP_RNBL,RDNS_DYNAMIC,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 21 Jun 2013 14:42:27 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/410/antivirus2); Fri, 21 Jun 2013 16:42:27 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/410/antivirus2) Received: (qmail 24023 invoked from network); 21 Jun 2013 16:42:27 +0200 Received: from 114.233.78.188.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@188.78.233.114) by us.es with SMTP; 21 Jun 2013 16:42:27 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net, eric@regit.org, tomasz.bursztyka@linux.intel.com Subject: [PATCH 4/5] meta: replace rtnl_tc_handle2str and rtnl_tc_str2handle Date: Fri, 21 Jun 2013 16:42:18 +0200 Message-Id: <1371825739-3669-4-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1371825739-3669-1-git-send-email-pablo@netfilter.org> References: <1371825739-3669-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Provide replacements for rtnl_tc_handle2str and rtnl_tc_str2handle, it removes the dependency with libnl-route. Signed-off-by: Pablo Neira Ayuso --- configure.ac | 3 --- src/meta.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index d8a850c..316d043 100644 --- a/configure.ac +++ b/configure.ac @@ -55,9 +55,6 @@ AC_CHECK_LIB([nl], [nl_socket_alloc], , AC_CHECK_LIB([nl-nf], [nfnl_nft_rule_alloc], , AC_MSG_ERROR([No suitable version of libnl-nf found])) -AC_CHECK_LIB([nl-route], [rtnl_link_alloc], , - AC_MSG_ERROR([No suitable version of libnl-route found])) - AC_CHECK_LIB([gmp], [__gmpz_init], , AC_MSG_ERROR([No suitable version of libgmp found])) diff --git a/src/meta.c b/src/meta.c index c5719b9..49d8130 100644 --- a/src/meta.c +++ b/src/meta.c @@ -14,12 +14,12 @@ #include #include #include +#include #include #include #include #include -#include -#include +#include #include #include @@ -65,10 +65,24 @@ static const struct datatype realm_type = { static void tchandle_type_print(const struct expr *expr) { - char buf[sizeof("ffff:ffff")]; - - printf("%s", rtnl_tc_handle2str(mpz_get_uint32(expr->value), - buf, sizeof(buf))); + uint32_t handle = mpz_get_uint32(expr->value); + + switch(handle) { + case TC_H_ROOT: + printf("root\n"); + case TC_H_UNSPEC: + printf("none\n"); + default: + if (TC_H_MAJ(handle) == 0) + printf(":%04x\n", TC_H_MIN(handle)); + else if (TC_H_MIN(handle) == 0) + printf("%04x:\n", TC_H_MAJ(handle) >> 16); + else { + printf("%04x:%04x\n", + TC_H_MAJ(handle) >> 16, TC_H_MIN(handle)); + } + break; + } } static struct error_record *tchandle_type_parse(const struct expr *sym, @@ -76,14 +90,33 @@ static struct error_record *tchandle_type_parse(const struct expr *sym, { uint32_t handle; - if (rtnl_tc_str2handle(sym->identifier, &handle) < 0) - return error(&sym->location, "Could not parse %s", - sym->dtype->desc); - + if (strcmp(sym->identifier, "root") == 0) + handle = TC_H_ROOT; + else if (strcmp(sym->identifier, "none") == 0) + handle = TC_H_UNSPEC; + else if (sym->identifier[0] == ':') { + if (sscanf(sym->identifier, ":%04x", &handle) < 0) + goto err; + } else if (sym->identifier[strlen(sym->identifier)-1] == ':') { + if (sscanf(sym->identifier, "%04x:", &handle) < 0) + goto err; + + handle <<= 16; + } else { + uint32_t min, max; + + if (sscanf(sym->identifier, "%04x:%04x", &min, &max) < 0) + goto err; + + handle = max << 16 | min; + } *res = constant_expr_alloc(&sym->location, sym->dtype, BYTEORDER_HOST_ENDIAN, sizeof(handle) * BITS_PER_BYTE, &handle); return NULL; +err: + return error(&sym->location, "Could not parse %s", + sym->dtype->desc); } static const struct datatype tchandle_type = {