From: Pablo Neira Ayuso Date: Thu, 19 Apr 2018 12:32:25 +0000 (+0200) Subject: src: use ibrname and obrname X-Git-Tag: v0.8.4~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4787edad132c30ae0f6bb00135ae5d970b0ccb74;p=thirdparty%2Fnftables.git src: use ibrname and obrname Legacy tool name is 'brctl' and so the 'br' prefix is already known. If we use ibrname and obrname it looks consistent with iifname and oifname. So let's this instead of ibridgename and obridgename since Florian likes this too. Signed-off-by: Pablo Neira Ayuso --- diff --git a/doc/nft.xml b/doc/nft.xml index 47e106900..661f632ef 100644 --- a/doc/nft.xml +++ b/doc/nft.xml @@ -2738,8 +2738,8 @@ filter output icmpv6 type { echo-request, echo-reply } skgid nftrace rtclassid - ibridgename - obridgename + ibrname + obrname pkttype cpu iifgroup @@ -2853,12 +2853,12 @@ filter output icmpv6 type { echo-request, echo-reply } realm - ibridgename + ibrname Input bridge interface name ifname - obridgename + obrname Output bridge interface name ifname diff --git a/src/meta.c b/src/meta.c index f80109641..3012efa94 100644 --- a/src/meta.c +++ b/src/meta.c @@ -413,10 +413,10 @@ static const struct meta_template meta_templates[] = { 1 , BYTEORDER_HOST_ENDIAN), [NFT_META_RTCLASSID] = META_TEMPLATE("rtclassid", &realm_type, 4 * 8, BYTEORDER_HOST_ENDIAN), - [NFT_META_BRI_IIFNAME] = META_TEMPLATE("ibridgename", &ifname_type, + [NFT_META_BRI_IIFNAME] = META_TEMPLATE("ibrname", &ifname_type, IFNAMSIZ * BITS_PER_BYTE, BYTEORDER_HOST_ENDIAN), - [NFT_META_BRI_OIFNAME] = META_TEMPLATE("obridgename", &ifname_type, + [NFT_META_BRI_OIFNAME] = META_TEMPLATE("obrname", &ifname_type, IFNAMSIZ * BITS_PER_BYTE, BYTEORDER_HOST_ENDIAN), [NFT_META_PKTTYPE] = META_TEMPLATE("pkttype", &pkttype_type, diff --git a/src/parser_bison.y b/src/parser_bison.y index 54304bd34..f546b9edd 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -394,8 +394,8 @@ int nft_lex(void *, void *, void *); %token RTCLASSID "rtclassid" %token IBRIPORT "ibriport" %token OBRIPORT "obriport" -%token IBRIDGENAME "ibridgename" -%token OBRIDGENAME "obridgename" +%token IBRIDGENAME "ibrname" +%token OBRIDGENAME "obrname" %token PKTTYPE "pkttype" %token CPU "cpu" %token IIFGROUP "iifgroup" diff --git a/src/scanner.l b/src/scanner.l index 9e8fe00bd..5f21bfd7e 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -486,9 +486,9 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "nftrace" { return NFTRACE; } "rtclassid" { return RTCLASSID; } "ibriport" { return IBRIPORT; } -"ibridgename" { return IBRIDGENAME; } +"ibrname" { return IBRIDGENAME; } "obriport" { return OBRIPORT; } -"obridgename" { return OBRIDGENAME; } +"obrname" { return OBRIDGENAME; } "pkttype" { return PKTTYPE; } "cpu" { return CPU; } "iifgroup" { return IIFGROUP; } diff --git a/tests/py/bridge/meta.t b/tests/py/bridge/meta.t index ed373677a..f8710b25f 100644 --- a/tests/py/bridge/meta.t +++ b/tests/py/bridge/meta.t @@ -2,5 +2,5 @@ *bridge;test-bridge;input -meta obridgename "br0";ok;meta obridgename "br0" -meta ibridgename "br0";ok;meta ibridgename "br0" +meta obrname "br0";ok;meta obrname "br0" +meta ibrname "br0";ok;meta ibrname "br0" diff --git a/tests/py/bridge/meta.t.payload b/tests/py/bridge/meta.t.payload index 2728c0a50..0f0d10178 100644 --- a/tests/py/bridge/meta.t.payload +++ b/tests/py/bridge/meta.t.payload @@ -1,9 +1,9 @@ -# meta obridgename "br0" +# meta obrname "br0" bridge test-bridge input [ meta load bri_oifname => reg 1 ] [ cmp eq reg 1 0x00307262 0x00000000 0x00000000 0x00000000 ] -# meta ibridgename "br0" +# meta ibrname "br0" bridge test-bridge input [ meta load bri_iifname => reg 1 ] [ cmp eq reg 1 0x00307262 0x00000000 0x00000000 0x00000000 ] diff --git a/tests/py/inet/meta.t b/tests/py/inet/meta.t index cfde9f32b..644a96fdf 100644 --- a/tests/py/inet/meta.t +++ b/tests/py/inet/meta.t @@ -14,5 +14,5 @@ meta nfproto ipv6 meta l4proto tcp;ok;meta nfproto ipv6 meta l4proto 6 meta nfproto ipv4 counter ip saddr 1.2.3.4;ok meta secpath exists;ok meta secpath missing;ok -meta ibridgename "br0";fail -meta obridgename "br0";fail +meta ibrname "br0";fail +meta obrname "br0";fail diff --git a/tests/py/ip/meta.t b/tests/py/ip/meta.t index c3afae793..4db883544 100644 --- a/tests/py/ip/meta.t +++ b/tests/py/ip/meta.t @@ -8,5 +8,5 @@ meta l4proto ipv6-icmp icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-adv meta l4proto 58 icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-advert icmpv6 type nd-router-advert;ok -meta ibridgename "br0";fail -meta obridgename "br0";fail +meta ibrname "br0";fail +meta obrname "br0";fail