diff options
| author | Can Erkin Acar <canacar@cvs.openbsd.org> | 2003-05-14 08:50:38 +0000 |
|---|---|---|
| committer | Can Erkin Acar <canacar@cvs.openbsd.org> | 2003-05-14 08:50:38 +0000 |
| commit | 7776f84fd3b0bc8897c89b7c525c6125fc067a1b (patch) | |
| tree | 1f7ffaaf9c33ca2967e278d23a0bcdb3e4888160 /lib/libpcap/grammar.y | |
| parent | ba0ae9ac18af661d67199b18276c8e19de2a1588 (diff) | |
libpcap and tcpdump now understand the new pflog datalink type.
old datalink type is still recognized.
ok henning@ dhartmei@ frantzen@
Diffstat (limited to 'lib/libpcap/grammar.y')
| -rw-r--r-- | lib/libpcap/grammar.y | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libpcap/grammar.y b/lib/libpcap/grammar.y index a038822c26f..6de982046b7 100644 --- a/lib/libpcap/grammar.y +++ b/lib/libpcap/grammar.y @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: grammar.y,v 1.10 2002/03/23 01:33:16 frantzen Exp $ */ +/* $OpenBSD: grammar.y,v 1.11 2003/05/14 08:50:37 canacar Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -24,7 +24,7 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/grammar.y,v 1.10 2002/03/23 01:33:16 frantzen Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/lib/libpcap/grammar.y,v 1.11 2003/05/14 08:50:37 canacar Exp $ (LBL)"; #endif #include <sys/types.h> @@ -108,7 +108,7 @@ pcap_parse() %token ATALK DECNET LAT SCA MOPRC MOPDL %token TK_BROADCAST TK_MULTICAST %token NUM INBOUND OUTBOUND -%token PF_IFNAME PF_RNR PF_REASON PF_ACTION +%token PF_IFNAME PF_RSET PF_RNR PF_SRNR PF_REASON PF_ACTION %token LINK %token GEQ LEQ NEQ %token ID EID HID HID6 @@ -274,7 +274,9 @@ other: pqual TK_BROADCAST { $$ = gen_broadcast($1); } ; pfvar: PF_IFNAME ID { $$ = gen_pf_ifname($2); } + | PF_RSET ID { $$ = gen_pf_ruleset($2); } | PF_RNR NUM { $$ = gen_pf_rnr($2); } + | PF_SRNR NUM { $$ = gen_pf_srnr($2); } | PF_REASON reason { $$ = gen_pf_reason($2); } | PF_ACTION action { $$ = gen_pf_action($2); } ; |