Sprinkle yyvarnext assignment until the port and proto rules work again.
XXX: this is not nice.
This commit is contained in:
parent
76303507fb
commit
065a08dedc
15
dist/ipf/tools/ipf_y.y
vendored
15
dist/ipf/tools/ipf_y.y
vendored
@ -363,7 +363,8 @@ proto: | protox protocol { yyresetdict(); }
|
||||
|
||||
protox: IPFY_PROTO { setipftype();
|
||||
fr = frc;
|
||||
yysetdict(NULL); }
|
||||
yysetdict(NULL);
|
||||
yyvarnext = 1; }
|
||||
;
|
||||
|
||||
ip: srcdst flags icmp
|
||||
@ -588,7 +589,7 @@ protocol:
|
||||
;
|
||||
|
||||
nextstring:
|
||||
'/' { yysetdict(NULL); }
|
||||
'/' { yysetdict(NULL); yyvarnext = 1; }
|
||||
;
|
||||
|
||||
fromto: from srcobject to dstobject { yyexpectaddr = 0; yycont = NULL; }
|
||||
@ -744,7 +745,6 @@ dstaddrlist:
|
||||
}
|
||||
;
|
||||
|
||||
|
||||
dstport:
|
||||
| portcomp
|
||||
{ DOALL(fr->fr_dcmp = $1.pc; fr->fr_dport = $1.p1;) }
|
||||
@ -902,20 +902,23 @@ poollist:
|
||||
|
||||
port: IPFY_PORT { yyexpectaddr = 0;
|
||||
yycont = NULL;
|
||||
yysetdict(NULL); }
|
||||
yysetdict(NULL);
|
||||
yyvarnext = 1; }
|
||||
;
|
||||
|
||||
portcomp:
|
||||
port compare portnum { $$.pc = $2;
|
||||
$$.p1 = $3;
|
||||
yyresetdict(); }
|
||||
yyresetdict();
|
||||
yyvarnext = 0; }
|
||||
;
|
||||
|
||||
portrange:
|
||||
port portnum range portnum { $$.p1 = $2;
|
||||
$$.pc = $3;
|
||||
$$.p2 = $4;
|
||||
yyresetdict(); }
|
||||
yyresetdict();
|
||||
yyvarnext = 0; }
|
||||
;
|
||||
|
||||
icmp: | itype icode
|
||||
|
Loading…
Reference in New Issue
Block a user