diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/proto.c | 5 | ||||
| -rw-r--r-- | src/scanner.l | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/proto.c b/src/proto.c index 67c519be..63727605 100644 --- a/src/proto.c +++ b/src/proto.c @@ -1057,8 +1057,11 @@ static const struct symbol_table ethertype_tbl = { SYMBOL("ip", __constant_htons(ETH_P_IP)), SYMBOL("arp", __constant_htons(ETH_P_ARP)), SYMBOL("ip6", __constant_htons(ETH_P_IPV6)), - SYMBOL("vlan", __constant_htons(ETH_P_8021Q)), + SYMBOL("8021q", __constant_htons(ETH_P_8021Q)), SYMBOL("8021ad", __constant_htons(ETH_P_8021AD)), + + /* for compatibility with older versions */ + SYMBOL("vlan", __constant_htons(ETH_P_8021Q)), SYMBOL_LIST_END }, }; diff --git a/src/scanner.l b/src/scanner.l index 9eb79d2d..a9232db8 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -423,6 +423,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "pcp" { return PCP; } } "8021ad" { yylval->string = xstrdup(yytext); return STRING; } +"8021q" { yylval->string = xstrdup(yytext); return STRING; } "arp" { scanner_push_start_cond(yyscanner, SCANSTATE_ARP); return ARP; } <SCANSTATE_ARP>{ |