diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-04-19 14:32:25 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-04-19 14:36:13 +0200 |
| commit | 4787edad132c30ae0f6bb00135ae5d970b0ccb74 (patch) | |
| tree | 7c2e262483080eda4f89e7f3b5dacef14621e0ed /src | |
| parent | 5a532726883a4ba37b8f5dd4616970b1fea730b1 (diff) | |
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 <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/meta.c | 4 | ||||
| -rw-r--r-- | src/parser_bison.y | 4 | ||||
| -rw-r--r-- | src/scanner.l | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -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 54304bd3..f546b9ed 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 9e8fe00b..5f21bfd7 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; } |