From patchwork Wed May 28 08:06:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 353270 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 023421400AA for ; Wed, 28 May 2014 18:06:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754271AbaE1IGe (ORCPT ); Wed, 28 May 2014 04:06:34 -0400 Received: from mail.us.es ([193.147.175.20]:51394 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754269AbaE1IG3 (ORCPT ); Wed, 28 May 2014 04:06:29 -0400 Received: (qmail 7984 invoked from network); 28 May 2014 10:06:27 +0200 Received: from unknown (HELO us.es) (192.168.2.13) by us.es with SMTP; 28 May 2014 10:06:27 +0200 Received: (qmail 26361 invoked by uid 507); 28 May 2014 08:06:27 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus3 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.3/19037. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-101.2/7.5):. Processed in 2.559555 secs); 28 May 2014 08:06:27 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus3 X-Spam-Level: X-Spam-Status: No, score=-101.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus3) (127.0.0.1) by us.es with SMTP; 28 May 2014 08:06:24 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus3 (F-Secure/fsigk_smtp/412/antivirus3); Wed, 28 May 2014 10:06:24 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus3) Received: (qmail 28353 invoked from network); 28 May 2014 10:06:24 +0200 Received: from 186.169.216.87.static.jazztel.es (HELO localhost.localdomain) (pneira@us.es@87.216.169.186) by mail.us.es with SMTP; 28 May 2014 10:06:24 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft] parser: use symbolic expression for ether too Date: Wed, 28 May 2014 10:06:16 +0200 Message-Id: <1401264376-4094-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Like in 0dbced3 ("parser: use symbolic expressions for parsing keywords as protocol values"), convert `ether' to use a symbolic expression. This fixes: # nft add rule ip filter input meta iiftype ether # nft list table filter table ip filter { ... iiftype 256 which was converted to network byte order. Reported-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/parser.y | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/parser.y b/src/parser.y index 20a836e..38b655d 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1848,10 +1848,9 @@ eth_hdr_expr : ETHER eth_hdr_field } | ETHER { - uint16_t data = ARPHRD_ETHER; - $$ = constant_expr_alloc(&@$, &arphrd_type, - BYTEORDER_BIG_ENDIAN, - sizeof(data) * BITS_PER_BYTE, &data); + $$ = symbol_expr_alloc(&@$, SYMBOL_VALUE, + current_scope(state), + "ether"); } ;