mask tcp[tcpflags] with 0x0fff to provide tcp flags only

rscheff · rscheff · commit cc84568cc9f9 · 2024-03-28T10:26:38.000+01:00
diff --git a/grammar.y.in b/grammar.y.in
@@ -854,7 +854,10 @@ arth:	  pnum			{ CHECK_PTR_VAL(($$ = gen_loadi(cstate, $1))); }
 	;
 tcpflags: TCPFLAGS
 	;
-narth:	  pname '[' tcpflags ']'	{ CHECK_PTR_VAL(($$ = gen_load(cstate, $1, gen_loadi(cstate, 12), 2))); }
+narth:	  pname '[' tcpflags ']'	{ CHECK_PTR_VAL(($$ =
+						gen_arth(cstate, BPF_AND,
+						    gen_load(cstate, $1, gen_loadi(cstate, 12), 2),
+						    gen_loadi(cstate, 0x0FFF)))); }
 	| pname '[' arth ']'		{ CHECK_PTR_VAL(($$ = gen_load(cstate, $1, $3, 1))); }
 	| pname '[' arth ':' NUM ']'	{ CHECK_PTR_VAL(($$ = gen_load(cstate, $1, $3, $5))); }
 	| arth '+' arth			{ CHECK_PTR_VAL(($$ = gen_arth(cstate, BPF_ADD, $1, $3))); }

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,10 @@ arth: pnum { CHECK_PTR_VAL(($$ = gen_loadi(cstate, $1))); }`
`854`	`854`	`;`
`855`	`855`	`tcpflags: TCPFLAGS`
`856`	`856`	`;`
`857`		`-narth: pname '[' tcpflags ']' { CHECK_PTR_VAL(($$ = gen_load(cstate, $1, gen_loadi(cstate, 12), 2))); }`
	`857`	`+narth: pname '[' tcpflags ']' { CHECK_PTR_VAL(($$ =`
	`858`	`+ gen_arth(cstate, BPF_AND,`
	`859`	`+ gen_load(cstate, $1, gen_loadi(cstate, 12), 2),`
	`860`	`+ gen_loadi(cstate, 0x0FFF)))); }`
`858`	`861`	`\| pname '[' arth ']' { CHECK_PTR_VAL(($$ = gen_load(cstate, $1, $3, 1))); }`
`859`	`862`	`\| pname '[' arth ':' NUM ']' { CHECK_PTR_VAL(($$ = gen_load(cstate, $1, $3, $5))); }`
`860`	`863`	`\| arth '+' arth { CHECK_PTR_VAL(($$ = gen_arth(cstate, BPF_ADD, $1, $3))); }`