Changeset a779a3b in rtems-libbsd

Timestamp:

May 2, 2018, 9:56:39 AM (12 months ago)

Author:

Christian Mauderer <christian.mauderer@…>

Branches:

647dd08ae2aa69b935c2847ea450fb824322ecae, c6261f97870562d4c797cfb1ff1ba0affb85a916

Children:

dd35ec5

Parents:

338f300

git-author:

Christian Mauderer <christian.mauderer@…> (05/02/18 09:56:39)

git-committer:

Christian Mauderer <christian.mauderer@…> (05/03/18 05:09:46)

Message:

pfctl: Undef INET6 to avoid warning.

Location:

freebsd/sbin/pfctl

Files:

• parse.c (modified) (275 diffs)
• parse.y (modified) (1 diff)

freebsd/sbin/pfctl/parse.c

@@ -6 +6 @@
 #define YYMAJOR 1
 #define YYMINOR 9
-#define YYPATCH 20160324
+#define YYPATCH 20170201
 
 #define YYEMPTY        (-1)
@@ -101 +101 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-user-space.h>
+#undef INET6
 #endif /* __rtems__ */
 
@@ -533 +534 @@
         !isdigit((addr).v.ifname[strlen((addr).v.ifname)-1])))
 
-#line 536 "pfctly.tab.c"
+#line 537 "pfctly.tab.c"
 
 /* compatibility with bison */
@@ -2569 +2570 @@
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
-#line 4550 "../../freebsd/sbin/pfctl/parse.y"
+#line 4551 "../../freebsd/sbin/pfctl/parse.y"
 #ifdef __rtems__
 RTEMS_LINKER_RWSET_CONTENT(bsd_prog_pfctl, extern YYSTYPE pfctlyval);
@@ -4367 +4368 @@
 #endif
 }
-#line 4370 "pfctly.tab.c"
+#line 4371 "pfctly.tab.c"
 
 #if YYDEBUG
-#include <stdio.h>              /* needed for printf */
+#include <stdio.h>      /* needed for printf */
 #endif
 
@@ -4442 +4443 @@
 #endif
 
+    yym = 0;
+    yyn = 0;
     yynerrs = 0;
     yyerrflag = 0;
@@ -4461 +4464 @@
     if (yychar < 0)
     {
-        if ((yychar = YYLEX) < 0) yychar = YYEOF;
+        yychar = YYLEX;
+        if (yychar < 0) yychar = YYEOF;
 #if YYDEBUG
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             printf("%sdebug: state %d, reading %d (%s)\n",
                     YYPREFIX, yystate, yychar, yys);
@@ -4471 +4475 @@
 #endif
     }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
     {
 #if YYDEBUG
@@ -4479 +4483 @@
                     YYPREFIX, yystate, yytable[yyn]);
 #endif
-        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-        {
-            goto yyoverflow;
-        }
+        if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
         yystate = yytable[yyn];
         *++yystack.s_mark = yytable[yyn];
@@ -4490 +4491 @@
         goto yyloop;
     }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
+    if (((yyn = yyrindex[yystate]) != 0) && (yyn += yychar) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)
     {
         yyn = yytable[yyn];
         goto yyreduce;
     }
-    if (yyerrflag) goto yyinrecovery;
+    if (yyerrflag != 0) goto yyinrecovery;
 
     YYERROR_CALL("syntax error");
 
-    goto yyerrlab;
-
+    goto yyerrlab; /* redundant goto avoids 'unused label' warning */
 yyerrlab:
     ++yynerrs;
@@ -4511 +4511 @@
         for (;;)
         {
-            if ((yyn = yysindex[*yystack.s_mark]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
+            if (((yyn = yysindex[*yystack.s_mark]) != 0) && (yyn += YYERRCODE) >= 0 &&
+                    yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) YYERRCODE)
             {
 #if YYDEBUG
@@ -4519 +4519 @@
  to state %d\n", YYPREFIX, *yystack.s_mark, yytable[yyn]);
 #endif
-                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-                {
-                    goto yyoverflow;
-                }
+                if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
                 yystate = yytable[yyn];
                 *++yystack.s_mark = yytable[yyn];
@@ -4547 +4544 @@
         if (yydebug)
         {
-            yys = yyname[YYTRANSLATE(yychar)];
+            if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
             printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
                     YYPREFIX, yystate, yychar, yys);
@@ -4563 +4560 @@
 #endif
     yym = yylen[yyn];
-    if (yym)
+    if (yym > 0)
         yyval = yystack.l_mark[1-yym];
     else
         memset(&yyval, 0, sizeof yyval);
+
     switch (yyn)
     {
 case 17:
-#line 555 "../../freebsd/sbin/pfctl/parse.y"
+#line 556 "../../freebsd/sbin/pfctl/parse.y"
         { file->errors++; }
 break;
 case 18:
-#line 558 "../../freebsd/sbin/pfctl/parse.y"
+#line 559 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct file     *nfile;
@@ -4590 +4588 @@
 break;
 case 25:
-#line 585 "../../freebsd/sbin/pfctl/parse.y"
+#line 586 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "none"))
@@ -4605 +4603 @@
 break;
 case 26:
-#line 599 "../../freebsd/sbin/pfctl/parse.y"
+#line 600 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION)) {
@@ -4620 +4618 @@
 break;
 case 27:
-#line 611 "../../freebsd/sbin/pfctl/parse.y"
+#line 612 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!(pf->opts & PF_OPT_OPTIMIZE)) {
@@ -4629 +4627 @@
 break;
 case 32:
-#line 621 "../../freebsd/sbin/pfctl/parse.y"
+#line 622 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION)) {
@@ -4644 +4642 @@
 break;
 case 33:
-#line 633 "../../freebsd/sbin/pfctl/parse.y"
+#line 634 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number == 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -4657 +4655 @@
 break;
 case 34:
-#line 643 "../../freebsd/sbin/pfctl/parse.y"
+#line 644 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4667 +4665 @@
 break;
 case 35:
-#line 650 "../../freebsd/sbin/pfctl/parse.y"
+#line 651 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4677 +4675 @@
 break;
 case 36:
-#line 657 "../../freebsd/sbin/pfctl/parse.y"
+#line 658 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4686 +4684 @@
 break;
 case 37:
-#line 663 "../../freebsd/sbin/pfctl/parse.y"
+#line 664 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4707 +4705 @@
 break;
 case 38:
-#line 681 "../../freebsd/sbin/pfctl/parse.y"
+#line 682 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4722 +4720 @@
 break;
 case 39:
-#line 693 "../../freebsd/sbin/pfctl/parse.y"
+#line 694 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION)) {
@@ -4737 +4735 @@
 break;
 case 40:
-#line 705 "../../freebsd/sbin/pfctl/parse.y"
+#line 706 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (expand_skip_interface(yystack.l_mark[0].v.interface) != 0) {
@@ -4746 +4744 @@
 break;
 case 41:
-#line 711 "../../freebsd/sbin/pfctl/parse.y"
+#line 712 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (keep_state_defaults != NULL) {
@@ -4756 +4754 @@
 break;
 case 42:
-#line 720 "../../freebsd/sbin/pfctl/parse.y"
+#line 721 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 43:
-#line 721 "../../freebsd/sbin/pfctl/parse.y"
+#line 722 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if ((yyval.v.string = strdup("all")) == NULL) {
@@ -4768 +4766 @@
 break;
 case 44:
-#line 728 "../../freebsd/sbin/pfctl/parse.y"
+#line 729 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (asprintf(&yyval.v.string, "%s %s", yystack.l_mark[-1].v.string, yystack.l_mark[0].v.string) == -1)
@@ -4777 +4775 @@
 break;
 case 46:
-#line 737 "../../freebsd/sbin/pfctl/parse.y"
+#line 738 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (asprintf(&yyval.v.string, "%s %s", yystack.l_mark[-1].v.string, yystack.l_mark[0].v.string) == -1)
@@ -4786 +4784 @@
 break;
 case 48:
-#line 746 "../../freebsd/sbin/pfctl/parse.y"
+#line 747 "../../freebsd/sbin/pfctl/parse.y"
         {
                         char    *s;
@@ -4797 +4795 @@
 break;
 case 50:
-#line 757 "../../freebsd/sbin/pfctl/parse.y"
+#line 758 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pf->opts & PF_OPT_VERBOSE)
@@ -4808 +4806 @@
 break;
 case 51:
-#line 767 "../../freebsd/sbin/pfctl/parse.y"
+#line 768 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 52:
-#line 768 "../../freebsd/sbin/pfctl/parse.y"
+#line 769 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.string = NULL; }
 break;
 case 57:
-#line 778 "../../freebsd/sbin/pfctl/parse.y"
+#line 779 "../../freebsd/sbin/pfctl/parse.y"
         {
                         char ta[PF_ANCHOR_NAME_SIZE];
@@ -4836 +4834 @@
 break;
 case 58:
-#line 795 "../../freebsd/sbin/pfctl/parse.y"
+#line 796 "../../freebsd/sbin/pfctl/parse.y"
         {
                         pf->alast = pf->anchor;
@@ -4844 +4842 @@
 break;
 case 60:
-#line 805 "../../freebsd/sbin/pfctl/parse.y"
+#line 806 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -4979 +4977 @@
 break;
 case 61:
-#line 937 "../../freebsd/sbin/pfctl/parse.y"
+#line 938 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -5003 +5001 @@
 break;
 case 62:
-#line 958 "../../freebsd/sbin/pfctl/parse.y"
+#line 959 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -5048 +5046 @@
 break;
 case 63:
-#line 1000 "../../freebsd/sbin/pfctl/parse.y"
+#line 1001 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -5086 +5084 @@
 break;
 case 64:
-#line 1037 "../../freebsd/sbin/pfctl/parse.y"
+#line 1038 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct loadanchors      *loadanchor;
@@ -5119 +5117 @@
 break;
 case 65:
-#line 1068 "../../freebsd/sbin/pfctl/parse.y"
+#line 1069 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = yyval.v.b.w = 0;
@@ -5129 +5127 @@
 break;
 case 66:
-#line 1078 "../../freebsd/sbin/pfctl/parse.y"
+#line 1079 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -5187 +5185 @@
 break;
 case 67:
-#line 1135 "../../freebsd/sbin/pfctl/parse.y"
+#line 1136 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&scrub_opts, sizeof scrub_opts);
@@ -5194 +5192 @@
 break;
 case 68:
-#line 1140 "../../freebsd/sbin/pfctl/parse.y"
+#line 1141 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.scrub_opts = scrub_opts; }
 break;
 case 69:
-#line 1141 "../../freebsd/sbin/pfctl/parse.y"
+#line 1142 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&scrub_opts, sizeof scrub_opts);
@@ -5206 +5204 @@
 break;
 case 72:
-#line 1152 "../../freebsd/sbin/pfctl/parse.y"
+#line 1153 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.nodf) {
@@ -5216 +5214 @@
 break;
 case 73:
-#line 1159 "../../freebsd/sbin/pfctl/parse.y"
+#line 1160 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.marker & SOM_MINTTL) {
@@ -5231 +5229 @@
 break;
 case 74:
-#line 1171 "../../freebsd/sbin/pfctl/parse.y"
+#line 1172 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.marker & SOM_MAXMSS) {
@@ -5246 +5244 @@
 break;
 case 75:
-#line 1183 "../../freebsd/sbin/pfctl/parse.y"
+#line 1184 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.marker & SOM_SETTOS) {
@@ -5257 +5255 @@
 break;
 case 76:
-#line 1191 "../../freebsd/sbin/pfctl/parse.y"
+#line 1192 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.marker & SOM_FRAGCACHE) {
@@ -5268 +5266 @@
 break;
 case 77:
-#line 1199 "../../freebsd/sbin/pfctl/parse.y"
+#line 1200 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (strcasecmp(yystack.l_mark[0].v.string, "tcp") != 0) {
@@ -5285 +5283 @@
 break;
 case 78:
-#line 1213 "../../freebsd/sbin/pfctl/parse.y"
+#line 1214 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (scrub_opts.randomid) {
@@ -5295 +5293 @@
 break;
 case 79:
-#line 1220 "../../freebsd/sbin/pfctl/parse.y"
+#line 1221 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
@@ -5305 +5303 @@
 break;
 case 80:
-#line 1227 "../../freebsd/sbin/pfctl/parse.y"
+#line 1228 "../../freebsd/sbin/pfctl/parse.y"
         {
                         scrub_opts.match_tag = yystack.l_mark[0].v.string;
@@ -5312 +5310 @@
 break;
 case 81:
-#line 1233 "../../freebsd/sbin/pfctl/parse.y"
+#line 1234 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 0; /* default */ }
 break;
 case 82:
-#line 1234 "../../freebsd/sbin/pfctl/parse.y"
-        { yyval.v.i = 0; }
-break;
-case 83:
 #line 1235 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 0; }
 break;
+case 83:
+#line 1236 "../../freebsd/sbin/pfctl/parse.y"
+        { yyval.v.i = 0; }
+break;
 case 84:
-#line 1238 "../../freebsd/sbin/pfctl/parse.y"
+#line 1239 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule           r;
@@ -5412 +5410 @@
 break;
 case 85:
-#line 1325 "../../freebsd/sbin/pfctl/parse.y"
+#line 1326 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 86:
-#line 1326 "../../freebsd/sbin/pfctl/parse.y"
+#line 1327 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 87:
-#line 1329 "../../freebsd/sbin/pfctl/parse.y"
+#line 1330 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 88:
-#line 1330 "../../freebsd/sbin/pfctl/parse.y"
+#line 1331 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.interface->tail->next = yystack.l_mark[-1].v.interface;
@@ -5432 +5430 @@
 break;
 case 89:
-#line 1337 "../../freebsd/sbin/pfctl/parse.y"
+#line 1338 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 90:
-#line 1338 "../../freebsd/sbin/pfctl/parse.y"
+#line 1339 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-1].v.interface->dynamic = 1;
@@ -5443 +5441 @@
 break;
 case 91:
-#line 1344 "../../freebsd/sbin/pfctl/parse.y"
+#line 1345 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&antispoof_opts, sizeof antispoof_opts);
@@ -5450 +5448 @@
 break;
 case 92:
-#line 1349 "../../freebsd/sbin/pfctl/parse.y"
+#line 1350 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.antispoof_opts = antispoof_opts; }
 break;
 case 93:
-#line 1350 "../../freebsd/sbin/pfctl/parse.y"
+#line 1351 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&antispoof_opts, sizeof antispoof_opts);
@@ -5462 +5460 @@
 break;
 case 96:
-#line 1361 "../../freebsd/sbin/pfctl/parse.y"
+#line 1362 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (antispoof_opts.label) {
@@ -5472 +5470 @@
 break;
 case 97:
-#line 1368 "../../freebsd/sbin/pfctl/parse.y"
+#line 1369 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
@@ -5482 +5480 @@
 break;
 case 98:
-#line 1377 "../../freebsd/sbin/pfctl/parse.y"
+#line 1378 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.number = 1; }
 break;
 case 99:
-#line 1378 "../../freebsd/sbin/pfctl/parse.y"
+#line 1379 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.number = 0; }
 break;
 case 100:
-#line 1381 "../../freebsd/sbin/pfctl/parse.y"
+#line 1382 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host         *h, *nh;
@@ -5521 +5519 @@
 break;
 case 101:
-#line 1411 "../../freebsd/sbin/pfctl/parse.y"
+#line 1412 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&table_opts, sizeof table_opts);
@@ -5528 +5526 @@
 break;
 case 102:
-#line 1416 "../../freebsd/sbin/pfctl/parse.y"
+#line 1417 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.table_opts = table_opts; }
 break;
 case 103:
-#line 1418 "../../freebsd/sbin/pfctl/parse.y"
+#line 1419 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&table_opts, sizeof table_opts);
@@ -5540 +5538 @@
 break;
 case 106:
-#line 1429 "../../freebsd/sbin/pfctl/parse.y"
+#line 1430 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "const"))
@@ -5557 +5555 @@
 break;
 case 107:
-#line 1443 "../../freebsd/sbin/pfctl/parse.y"
+#line 1444 "../../freebsd/sbin/pfctl/parse.y"
         { table_opts.init_addr = 1; }
 break;
 case 108:
-#line 1444 "../../freebsd/sbin/pfctl/parse.y"
+#line 1445 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host        *n;
@@ -5604 +5602 @@
 break;
 case 109:
-#line 1484 "../../freebsd/sbin/pfctl/parse.y"
+#line 1485 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_tinit       *ti;
@@ -5617 +5615 @@
 break;
 case 110:
-#line 1496 "../../freebsd/sbin/pfctl/parse.y"
+#line 1497 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_altq  a;
@@ -5642 +5640 @@
 break;
 case 111:
-#line 1520 "../../freebsd/sbin/pfctl/parse.y"
+#line 1521 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_altq  a;
@@ -5680 +5678 @@
 break;
 case 112:
-#line 1557 "../../freebsd/sbin/pfctl/parse.y"
+#line 1558 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&queue_opts, sizeof queue_opts);
@@ -5690 +5688 @@
 break;
 case 113:
-#line 1565 "../../freebsd/sbin/pfctl/parse.y"
+#line 1566 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.queue_opts = queue_opts; }
 break;
 case 114:
-#line 1566 "../../freebsd/sbin/pfctl/parse.y"
+#line 1567 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&queue_opts, sizeof queue_opts);
@@ -5705 +5703 @@
 break;
 case 117:
-#line 1580 "../../freebsd/sbin/pfctl/parse.y"
+#line 1581 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (queue_opts.marker & QOM_BWSPEC) {
@@ -5716 +5714 @@
 break;
 case 118:
-#line 1588 "../../freebsd/sbin/pfctl/parse.y"
+#line 1589 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (queue_opts.marker & QOM_PRIORITY) {
@@ -5731 +5729 @@
 break;
 case 119:
-#line 1600 "../../freebsd/sbin/pfctl/parse.y"
+#line 1601 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (queue_opts.marker & QOM_QLIMIT) {
@@ -5746 +5744 @@
 break;
 case 120:
-#line 1612 "../../freebsd/sbin/pfctl/parse.y"
+#line 1613 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (queue_opts.marker & QOM_SCHEDULER) {
@@ -5757 +5755 @@
 break;
 case 121:
-#line 1620 "../../freebsd/sbin/pfctl/parse.y"
+#line 1621 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (queue_opts.marker & QOM_TBRSIZE) {
@@ -5772 +5770 @@
 break;
 case 122:
-#line 1634 "../../freebsd/sbin/pfctl/parse.y"
+#line 1635 "../../freebsd/sbin/pfctl/parse.y"
         {
                         double   bps;
@@ -5818 +5816 @@
 break;
 case 123:
-#line 1677 "../../freebsd/sbin/pfctl/parse.y"
+#line 1678 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -5829 +5827 @@
 break;
 case 124:
-#line 1687 "../../freebsd/sbin/pfctl/parse.y"
+#line 1688 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_CBQ;
@@ -5836 +5834 @@
 break;
 case 125:
-#line 1691 "../../freebsd/sbin/pfctl/parse.y"
+#line 1692 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_CBQ;
@@ -5843 +5841 @@
 break;
 case 126:
-#line 1695 "../../freebsd/sbin/pfctl/parse.y"
+#line 1696 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_PRIQ;
@@ -5850 +5848 @@
 break;
 case 127:
-#line 1699 "../../freebsd/sbin/pfctl/parse.y"
+#line 1700 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_PRIQ;
@@ -5857 +5855 @@
 break;
 case 128:
-#line 1703 "../../freebsd/sbin/pfctl/parse.y"
+#line 1704 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_HFSC;
@@ -5865 +5863 @@
 break;
 case 129:
-#line 1708 "../../freebsd/sbin/pfctl/parse.y"
+#line 1709 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_HFSC;
@@ -5872 +5870 @@
 break;
 case 130:
-#line 1712 "../../freebsd/sbin/pfctl/parse.y"
+#line 1713 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_FAIRQ;
@@ -5880 +5878 @@
 break;
 case 131:
-#line 1717 "../../freebsd/sbin/pfctl/parse.y"
+#line 1718 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_FAIRQ;
@@ -5887 +5885 @@
 break;
 case 132:
-#line 1721 "../../freebsd/sbin/pfctl/parse.y"
+#line 1722 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_CODEL;
@@ -5895 +5893 @@
 break;
 case 133:
-#line 1726 "../../freebsd/sbin/pfctl/parse.y"
+#line 1727 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue_options.qtype = ALTQT_CODEL;
@@ -5902 +5900 @@
 break;
 case 134:
-#line 1732 "../../freebsd/sbin/pfctl/parse.y"
-        { yyval.v.number |= yystack.l_mark[0].v.number; }
-break;
-case 135:
 #line 1733 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
+case 135:
+#line 1734 "../../freebsd/sbin/pfctl/parse.y"
+        { yyval.v.number |= yystack.l_mark[0].v.number; }
+break;
 case 136:
-#line 1736 "../../freebsd/sbin/pfctl/parse.y"
+#line 1737 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "default"))
@@ -5933 +5931 @@
 break;
 case 137:
-#line 1758 "../../freebsd/sbin/pfctl/parse.y"
-        { yyval.v.number |= yystack.l_mark[0].v.number; }
-break;
-case 138:
 #line 1759 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.number |= yystack.l_mark[0].v.number; }
 break;
+case 138:
+#line 1760 "../../freebsd/sbin/pfctl/parse.y"
+        { yyval.v.number |= yystack.l_mark[0].v.number; }
+break;
 case 139:
-#line 1762 "../../freebsd/sbin/pfctl/parse.y"
+#line 1763 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "default"))
@@ -5962 +5960 @@
 break;
 case 140:
-#line 1782 "../../freebsd/sbin/pfctl/parse.y"
+#line 1783 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&hfsc_opts,
@@ -5969 +5967 @@
 break;
 case 141:
-#line 1786 "../../freebsd/sbin/pfctl/parse.y"
+#line 1787 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.hfsc_opts = hfsc_opts;
@@ -5975 +5973 @@
 break;
 case 144:
-#line 1795 "../../freebsd/sbin/pfctl/parse.y"
+#line 1796 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (hfsc_opts.linkshare.used) {
@@ -5986 +5984 @@
 break;
 case 145:
-#line 1804 "../../freebsd/sbin/pfctl/parse.y"
+#line 1805 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
@@ -6003 +6001 @@
 break;
 case 146:
-#line 1818 "../../freebsd/sbin/pfctl/parse.y"
+#line 1819 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (hfsc_opts.realtime.used) {
@@ -6014 +6012 @@
 break;
 case 147:
-#line 1827 "../../freebsd/sbin/pfctl/parse.y"
+#line 1828 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
@@ -6031 +6029 @@
 break;
 case 148:
-#line 1841 "../../freebsd/sbin/pfctl/parse.y"
+#line 1842 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (hfsc_opts.upperlimit.used) {
@@ -6042 +6040 @@
 break;
 case 149:
-#line 1850 "../../freebsd/sbin/pfctl/parse.y"
+#line 1851 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > INT_MAX) {
@@ -6059 +6057 @@
 break;
 case 150:
-#line 1864 "../../freebsd/sbin/pfctl/parse.y"
+#line 1865 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "default"))
@@ -6080 +6078 @@
 break;
 case 151:
-#line 1884 "../../freebsd/sbin/pfctl/parse.y"
+#line 1885 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&fairq_opts,
@@ -6087 +6085 @@
 break;
 case 152:
-#line 1888 "../../freebsd/sbin/pfctl/parse.y"
+#line 1889 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.fairq_opts = fairq_opts;
@@ -6093 +6091 @@
 break;
 case 155:
-#line 1897 "../../freebsd/sbin/pfctl/parse.y"
+#line 1898 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (fairq_opts.linkshare.used) {
@@ -6104 +6102 @@
 break;
 case 156:
-#line 1905 "../../freebsd/sbin/pfctl/parse.y"
+#line 1906 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (fairq_opts.linkshare.used) {
@@ -6117 +6115 @@
 break;
 case 157:
-#line 1915 "../../freebsd/sbin/pfctl/parse.y"
+#line 1916 "../../freebsd/sbin/pfctl/parse.y"
         {
                         fairq_opts.hogs_bw = yystack.l_mark[0].v.queue_bwspec;
@@ -6123 +6121 @@
 break;
 case 158:
-#line 1918 "../../freebsd/sbin/pfctl/parse.y"
+#line 1919 "../../freebsd/sbin/pfctl/parse.y"
         {
                         fairq_opts.nbuckets = yystack.l_mark[0].v.number;
@@ -6129 +6127 @@
 break;
 case 159:
-#line 1921 "../../freebsd/sbin/pfctl/parse.y"
+#line 1922 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "default"))
@@ -6150 +6148 @@
 break;
 case 160:
-#line 1941 "../../freebsd/sbin/pfctl/parse.y"
+#line 1942 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&codel_opts,
@@ -6157 +6155 @@
 break;
 case 161:
-#line 1945 "../../freebsd/sbin/pfctl/parse.y"
+#line 1946 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.codel_opts = codel_opts;
@@ -6163 +6161 @@
 break;
 case 164:
-#line 1954 "../../freebsd/sbin/pfctl/parse.y"
+#line 1955 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (codel_opts.interval) {
@@ -6173 +6171 @@
 break;
 case 165:
-#line 1961 "../../freebsd/sbin/pfctl/parse.y"
+#line 1962 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (codel_opts.target) {
@@ -6183 +6181 @@
 break;
 case 166:
-#line 1968 "../../freebsd/sbin/pfctl/parse.y"
+#line 1969 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "ecn"))
@@ -6196 +6194 @@
 break;
 case 167:
-#line 1980 "../../freebsd/sbin/pfctl/parse.y"
+#line 1981 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.queue = NULL; }
 break;
 case 168:
-#line 1981 "../../freebsd/sbin/pfctl/parse.y"
+#line 1982 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.queue = yystack.l_mark[0].v.queue; }
 break;
 case 169:
-#line 1982 "../../freebsd/sbin/pfctl/parse.y"
+#line 1983 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.queue = yystack.l_mark[-1].v.queue; }
 break;
 case 170:
-#line 1985 "../../freebsd/sbin/pfctl/parse.y"
+#line 1986 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.queue = yystack.l_mark[-1].v.queue; }
 break;
 case 171:
-#line 1986 "../../freebsd/sbin/pfctl/parse.y"
+#line 1987 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.queue->tail->next = yystack.l_mark[-1].v.queue;
@@ -6220 +6218 @@
 break;
 case 172:
-#line 1993 "../../freebsd/sbin/pfctl/parse.y"
+#line 1994 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.queue = calloc(1, sizeof(struct node_queue));
@@ -6239 +6237 @@
 break;
 case 173:
-#line 2013 "../../freebsd/sbin/pfctl/parse.y"
+#line 2014 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule           r;
@@ -6664 +6662 @@
 break;
 case 174:
-#line 2437 "../../freebsd/sbin/pfctl/parse.y"
+#line 2438 "../../freebsd/sbin/pfctl/parse.y"
         {
                                 bzero(&filter_opts, sizeof filter_opts);
@@ -6671 +6669 @@
 break;
 case 175:
-#line 2442 "../../freebsd/sbin/pfctl/parse.y"
+#line 2443 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.filter_opts = filter_opts; }
 break;
 case 176:
-#line 2443 "../../freebsd/sbin/pfctl/parse.y"
+#line 2444 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&filter_opts, sizeof filter_opts);
@@ -6683 +6681 @@
 break;
 case 179:
-#line 2454 "../../freebsd/sbin/pfctl/parse.y"
+#line 2455 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.uid)
@@ -6691 +6689 @@
 break;
 case 180:
-#line 2459 "../../freebsd/sbin/pfctl/parse.y"
+#line 2460 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.gid)
@@ -6699 +6697 @@
 break;
 case 181:
-#line 2464 "../../freebsd/sbin/pfctl/parse.y"
+#line 2465 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_FLAGS) {
@@ -6713 +6711 @@
 break;
 case 182:
-#line 2475 "../../freebsd/sbin/pfctl/parse.y"
+#line 2476 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_ICMP) {
@@ -6724 +6722 @@
 break;
 case 183:
-#line 2483 "../../freebsd/sbin/pfctl/parse.y"
+#line 2484 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_PRIO) {
@@ -6739 +6737 @@
 break;
 case 184:
-#line 2495 "../../freebsd/sbin/pfctl/parse.y"
+#line 2496 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_TOS) {
@@ -6750 +6748 @@
 break;
 case 185:
-#line 2503 "../../freebsd/sbin/pfctl/parse.y"
+#line 2504 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_KEEP) {
@@ -6762 +6760 @@
 break;
 case 186:
-#line 2512 "../../freebsd/sbin/pfctl/parse.y"
+#line 2513 "../../freebsd/sbin/pfctl/parse.y"
         {
                         filter_opts.fragment = 1;
@@ -6768 +6766 @@
 break;
 case 187:
-#line 2515 "../../freebsd/sbin/pfctl/parse.y"
+#line 2516 "../../freebsd/sbin/pfctl/parse.y"
         {
                         filter_opts.allowopts = 1;
@@ -6774 +6772 @@
 break;
 case 188:
-#line 2518 "../../freebsd/sbin/pfctl/parse.y"
+#line 2519 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.label) {
@@ -6784 +6782 @@
 break;
 case 189:
-#line 2525 "../../freebsd/sbin/pfctl/parse.y"
+#line 2526 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.queues.qname) {
@@ -6794 +6792 @@
 break;
 case 190:
-#line 2532 "../../freebsd/sbin/pfctl/parse.y"
+#line 2533 "../../freebsd/sbin/pfctl/parse.y"
         {
                         filter_opts.tag = yystack.l_mark[0].v.string;
@@ -6800 +6798 @@
 break;
 case 191:
-#line 2535 "../../freebsd/sbin/pfctl/parse.y"
+#line 2536 "../../freebsd/sbin/pfctl/parse.y"
         {
                         filter_opts.match_tag = yystack.l_mark[0].v.string;
@@ -6807 +6805 @@
 break;
 case 192:
-#line 2539 "../../freebsd/sbin/pfctl/parse.y"
+#line 2540 "../../freebsd/sbin/pfctl/parse.y"
         {
                         double  p;
@@ -6822 +6820 @@
 break;
 case 193:
-#line 2551 "../../freebsd/sbin/pfctl/parse.y"
+#line 2552 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
@@ -6832 +6830 @@
 break;
 case 194:
-#line 2558 "../../freebsd/sbin/pfctl/parse.y"
+#line 2559 "../../freebsd/sbin/pfctl/parse.y"
         {
 #ifdef __FreeBSD__
@@ -6844 +6842 @@
 break;
 case 195:
-#line 2567 "../../freebsd/sbin/pfctl/parse.y"
+#line 2568 "../../freebsd/sbin/pfctl/parse.y"
         {
 #ifndef __FreeBSD__
@@ -6865 +6863 @@
 break;
 case 196:
-#line 2585 "../../freebsd/sbin/pfctl/parse.y"
+#line 2586 "../../freebsd/sbin/pfctl/parse.y"
         {
 #ifdef __FreeBSD__
@@ -6876 +6874 @@
 break;
 case 198:
-#line 2596 "../../freebsd/sbin/pfctl/parse.y"
-        { yyval.v.filter_opts = filter_opts; }
-break;
-case 199:
 #line 2597 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.filter_opts = filter_opts; }
 break;
+case 199:
+#line 2598 "../../freebsd/sbin/pfctl/parse.y"
+        { yyval.v.filter_opts = filter_opts; }
+break;
 case 202:
-#line 2604 "../../freebsd/sbin/pfctl/parse.y"
+#line 2605 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & FOM_SETPRIO) {
@@ -6896 +6894 @@
 break;
 case 203:
-#line 2613 "../../freebsd/sbin/pfctl/parse.y"
+#line 2614 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > PF_PRIO_MAX) {
@@ -6906 +6904 @@
 break;
 case 204:
-#line 2620 "../../freebsd/sbin/pfctl/parse.y"
+#line 2621 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-3].v.number < 0 || yystack.l_mark[-3].v.number > PF_PRIO_MAX ||
@@ -6918 +6916 @@
 break;
 case 205:
-#line 2631 "../../freebsd/sbin/pfctl/parse.y"
+#line 2632 "../../freebsd/sbin/pfctl/parse.y"
         {
                         char    *e;
@@ -6937 +6935 @@
 break;
 case 206:
-#line 2647 "../../freebsd/sbin/pfctl/parse.y"
+#line 2648 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.probability = (double)yystack.l_mark[0].v.number;
@@ -6943 +6941 @@
 break;
 case 207:
-#line 2653 "../../freebsd/sbin/pfctl/parse.y"
+#line 2654 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = PF_PASS; yyval.v.b.b2 = yyval.v.b.w = 0; }
 break;
 case 208:
-#line 2654 "../../freebsd/sbin/pfctl/parse.y"
+#line 2655 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b = yystack.l_mark[0].v.b; yyval.v.b.b1 = PF_DROP; }
 break;
 case 209:
-#line 2657 "../../freebsd/sbin/pfctl/parse.y"
+#line 2658 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = blockpolicy;
@@ -6959 +6957 @@
 break;
 case 210:
-#line 2662 "../../freebsd/sbin/pfctl/parse.y"
+#line 2663 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_DROP;
@@ -6967 +6965 @@
 break;
 case 211:
-#line 2667 "../../freebsd/sbin/pfctl/parse.y"
+#line 2668 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNRST;
@@ -6975 +6973 @@
 break;
 case 212:
-#line 2672 "../../freebsd/sbin/pfctl/parse.y"
+#line 2673 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-1].v.number < 0 || yystack.l_mark[-1].v.number > 255) {
@@ -6987 +6985 @@
 break;
 case 213:
-#line 2681 "../../freebsd/sbin/pfctl/parse.y"
+#line 2682 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNICMP;
@@ -6995 +6993 @@
 break;
 case 214:
-#line 2686 "../../freebsd/sbin/pfctl/parse.y"
+#line 2687 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNICMP;
@@ -7003 +7001 @@
 break;
 case 215:
-#line 2691 "../../freebsd/sbin/pfctl/parse.y"
+#line 2692 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNICMP;
@@ -7011 +7009 @@
 break;
 case 216:
-#line 2696 "../../freebsd/sbin/pfctl/parse.y"
+#line 2697 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNICMP;
@@ -7019 +7017 @@
 break;
 case 217:
-#line 2701 "../../freebsd/sbin/pfctl/parse.y"
+#line 2702 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURNICMP;
@@ -7027 +7025 @@
 break;
 case 218:
-#line 2706 "../../freebsd/sbin/pfctl/parse.y"
+#line 2707 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.b.b2 = PFRULE_RETURN;
@@ -7035 +7033 @@
 break;
 case 219:
-#line 2713 "../../freebsd/sbin/pfctl/parse.y"
+#line 2714 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!(yyval.v.number = parseicmpspec(yystack.l_mark[0].v.string, AF_INET))) {
@@ -7045 +7043 @@
 break;
 case 220:
-#line 2720 "../../freebsd/sbin/pfctl/parse.y"
+#line 2721 "../../freebsd/sbin/pfctl/parse.y"
         {
                         u_int8_t                icmptype;
@@ -7058 +7056 @@
 break;
 case 221:
-#line 2732 "../../freebsd/sbin/pfctl/parse.y"
+#line 2733 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!(yyval.v.number = parseicmpspec(yystack.l_mark[0].v.string, AF_INET6))) {
@@ -7068 +7066 @@
 break;
 case 222:
-#line 2739 "../../freebsd/sbin/pfctl/parse.y"
+#line 2740 "../../freebsd/sbin/pfctl/parse.y"
         {
                         u_int8_t                icmptype;
@@ -7081 +7079 @@
 break;
 case 223:
-#line 2751 "../../freebsd/sbin/pfctl/parse.y"
+#line 2752 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_INOUT; }
 break;
 case 224:
-#line 2752 "../../freebsd/sbin/pfctl/parse.y"
+#line 2753 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_IN; }
 break;
 case 225:
-#line 2753 "../../freebsd/sbin/pfctl/parse.y"
+#line 2754 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OUT; }
 break;
 case 226:
-#line 2756 "../../freebsd/sbin/pfctl/parse.y"
+#line 2757 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.quick = 0; }
 break;
 case 227:
-#line 2757 "../../freebsd/sbin/pfctl/parse.y"
+#line 2758 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.quick = 1; }
 break;
 case 228:
-#line 2760 "../../freebsd/sbin/pfctl/parse.y"
+#line 2761 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.log = 0; yyval.v.logquick.quick = 0; yyval.v.logquick.logif = 0; }
 break;
 case 229:
-#line 2761 "../../freebsd/sbin/pfctl/parse.y"
+#line 2762 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick = yystack.l_mark[0].v.logquick; yyval.v.logquick.quick = 0; }
 break;
 case 230:
-#line 2762 "../../freebsd/sbin/pfctl/parse.y"
+#line 2763 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.quick = 1; yyval.v.logquick.log = 0; yyval.v.logquick.logif = 0; }
 break;
 case 231:
-#line 2763 "../../freebsd/sbin/pfctl/parse.y"
+#line 2764 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick = yystack.l_mark[-1].v.logquick; yyval.v.logquick.quick = 1; }
 break;
 case 232:
-#line 2764 "../../freebsd/sbin/pfctl/parse.y"
+#line 2765 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick = yystack.l_mark[0].v.logquick; yyval.v.logquick.quick = 1; }
 break;
 case 233:
-#line 2767 "../../freebsd/sbin/pfctl/parse.y"
+#line 2768 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.log = PF_LOG; yyval.v.logquick.logif = 0; }
 break;
 case 234:
-#line 2768 "../../freebsd/sbin/pfctl/parse.y"
+#line 2769 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.logquick.log = PF_LOG | yystack.l_mark[-1].v.logquick.log;
@@ -7132 +7130 @@
 break;
 case 235:
-#line 2774 "../../freebsd/sbin/pfctl/parse.y"
+#line 2775 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick = yystack.l_mark[0].v.logquick; }
 break;
 case 236:
-#line 2775 "../../freebsd/sbin/pfctl/parse.y"
+#line 2776 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.logquick.log = yystack.l_mark[-2].v.logquick.log | yystack.l_mark[0].v.logquick.log;
@@ -7145 +7143 @@
 break;
 case 237:
-#line 2783 "../../freebsd/sbin/pfctl/parse.y"
+#line 2784 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.log = PF_LOG_ALL; yyval.v.logquick.logif = 0; }
 break;
 case 238:
-#line 2784 "../../freebsd/sbin/pfctl/parse.y"
-        { yyval.v.logquick.log = PF_LOG_SOCKET_LOOKUP; yyval.v.logquick.logif = 0; }
-break;
-case 239:
 #line 2785 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.logquick.log = PF_LOG_SOCKET_LOOKUP; yyval.v.logquick.logif = 0; }
 break;
+case 239:
+#line 2786 "../../freebsd/sbin/pfctl/parse.y"
+        { yyval.v.logquick.log = PF_LOG_SOCKET_LOOKUP; yyval.v.logquick.logif = 0; }
+break;
 case 240:
-#line 2786 "../../freebsd/sbin/pfctl/parse.y"
+#line 2787 "../../freebsd/sbin/pfctl/parse.y"
         {
                         const char      *errstr;
@@ -7179 +7177 @@
 break;
 case 241:
-#line 2807 "../../freebsd/sbin/pfctl/parse.y"
+#line 2808 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = NULL; }
 break;
 case 242:
-#line 2808 "../../freebsd/sbin/pfctl/parse.y"
+#line 2809 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[0].v.interface; }
 break;
 case 243:
-#line 2809 "../../freebsd/sbin/pfctl/parse.y"
+#line 2810 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 244:
-#line 2812 "../../freebsd/sbin/pfctl/parse.y"
+#line 2813 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[-1].v.interface; }
 break;
 case 245:
-#line 2813 "../../freebsd/sbin/pfctl/parse.y"
+#line 2814 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.interface->tail->next = yystack.l_mark[-1].v.interface;
@@ -7203 +7201 @@
 break;
 case 246:
-#line 2820 "../../freebsd/sbin/pfctl/parse.y"
+#line 2821 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.interface = yystack.l_mark[0].v.interface; yyval.v.interface->not = yystack.l_mark[-1].v.number; }
 break;
 case 247:
-#line 2823 "../../freebsd/sbin/pfctl/parse.y"
+#line 2824 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host        *n;
@@ -7232 +7230 @@
 break;
 case 248:
-#line 2847 "../../freebsd/sbin/pfctl/parse.y"
+#line 2848 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 0; }
 break;
 case 249:
-#line 2848 "../../freebsd/sbin/pfctl/parse.y"
+#line 2849 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = AF_INET; }
 break;
 case 250:
-#line 2849 "../../freebsd/sbin/pfctl/parse.y"
+#line 2850 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = AF_INET6; }
 break;
 case 251:
-#line 2852 "../../freebsd/sbin/pfctl/parse.y"
+#line 2853 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.proto = NULL; }
 break;
 case 252:
-#line 2853 "../../freebsd/sbin/pfctl/parse.y"
+#line 2854 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.proto = yystack.l_mark[0].v.proto; }
 break;
 case 253:
-#line 2854 "../../freebsd/sbin/pfctl/parse.y"
+#line 2855 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.proto = yystack.l_mark[-1].v.proto; }
 break;
 case 254:
-#line 2857 "../../freebsd/sbin/pfctl/parse.y"
+#line 2858 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.proto = yystack.l_mark[-1].v.proto; }
 break;
 case 255:
-#line 2858 "../../freebsd/sbin/pfctl/parse.y"
+#line 2859 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.proto->tail->next = yystack.l_mark[-1].v.proto;
@@ -7268 +7266 @@
 break;
 case 256:
-#line 2865 "../../freebsd/sbin/pfctl/parse.y"
+#line 2866 "../../freebsd/sbin/pfctl/parse.y"
         {
                         u_int8_t        pr;
@@ -7286 +7284 @@
 break;
 case 257:
-#line 2882 "../../freebsd/sbin/pfctl/parse.y"
+#line 2883 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct protoent *p;
@@ -7301 +7299 @@
 break;
 case 258:
-#line 2894 "../../freebsd/sbin/pfctl/parse.y"
+#line 2895 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
@@ -7310 +7308 @@
 break;
 case 259:
-#line 2902 "../../freebsd/sbin/pfctl/parse.y"
+#line 2903 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.fromto.src.host = NULL;
@@ -7320 +7318 @@
 break;
 case 260:
-#line 2909 "../../freebsd/sbin/pfctl/parse.y"
+#line 2910 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.fromto.src = yystack.l_mark[-2].v.peer;
@@ -7328 +7326 @@
 break;
 case 261:
-#line 2916 "../../freebsd/sbin/pfctl/parse.y"
+#line 2917 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.os = NULL; }
 break;
 case 262:
-#line 2917 "../../freebsd/sbin/pfctl/parse.y"
+#line 2918 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.os = yystack.l_mark[0].v.os; }
 break;
 case 263:
-#line 2918 "../../freebsd/sbin/pfctl/parse.y"
+#line 2919 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.os = yystack.l_mark[-1].v.os; }
 break;
 case 264:
-#line 2921 "../../freebsd/sbin/pfctl/parse.y"
+#line 2922 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.os = calloc(1, sizeof(struct node_os));
@@ -7350 +7348 @@
 break;
 case 265:
-#line 2930 "../../freebsd/sbin/pfctl/parse.y"
+#line 2931 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.os = yystack.l_mark[-1].v.os; }
 break;
 case 266:
-#line 2931 "../../freebsd/sbin/pfctl/parse.y"
+#line 2932 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.os->tail->next = yystack.l_mark[-1].v.os;
@@ -7362 +7360 @@
 break;
 case 267:
-#line 2938 "../../freebsd/sbin/pfctl/parse.y"
+#line 2939 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer.host = NULL;
@@ -7369 +7367 @@
 break;
 case 268:
-#line 2942 "../../freebsd/sbin/pfctl/parse.y"
+#line 2943 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer = yystack.l_mark[0].v.peer;
@@ -7375 +7373 @@
 break;
 case 269:
-#line 2947 "../../freebsd/sbin/pfctl/parse.y"
+#line 2948 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer.host = NULL;
@@ -7382 +7380 @@
 break;
 case 270:
-#line 2951 "../../freebsd/sbin/pfctl/parse.y"
+#line 2952 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (disallow_urpf_failed(yystack.l_mark[0].v.peer.host, "\"urpf-failed\" is "
@@ -7391 +7389 @@
 break;
 case 271:
-#line 2959 "../../freebsd/sbin/pfctl/parse.y"
+#line 2960 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer.host = yystack.l_mark[0].v.host;
@@ -7398 +7396 @@
 break;
 case 272:
-#line 2963 "../../freebsd/sbin/pfctl/parse.y"
+#line 2964 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer.host = yystack.l_mark[-2].v.host;
@@ -7405 +7403 @@
 break;
 case 273:
-#line 2967 "../../freebsd/sbin/pfctl/parse.y"
+#line 2968 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.peer.host = NULL;
@@ -7412 +7410 @@
 break;
 case 276:
-#line 2977 "../../freebsd/sbin/pfctl/parse.y"
+#line 2978 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = NULL; }
 break;
 case 277:
-#line 2978 "../../freebsd/sbin/pfctl/parse.y"
+#line 2979 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 278:
-#line 2979 "../../freebsd/sbin/pfctl/parse.y"
+#line 2980 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 279:
-#line 2982 "../../freebsd/sbin/pfctl/parse.y"
+#line 2983 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 280:
-#line 2983 "../../freebsd/sbin/pfctl/parse.y"
+#line 2984 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = NULL; }
 break;
 case 281:
-#line 2986 "../../freebsd/sbin/pfctl/parse.y"
+#line 2987 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 282:
-#line 2987 "../../freebsd/sbin/pfctl/parse.y"
+#line 2988 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-1].v.host == NULL)
@@ -7450 +7448 @@
 break;
 case 283:
-#line 3000 "../../freebsd/sbin/pfctl/parse.y"
+#line 3001 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host        *n;
@@ -7460 +7458 @@
 break;
 case 284:
-#line 3007 "../../freebsd/sbin/pfctl/parse.y"
+#line 3008 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.host = calloc(1, sizeof(struct node_host));
@@ -7472 +7470 @@
 break;
 case 285:
-#line 3016 "../../freebsd/sbin/pfctl/parse.y"
+#line 3017 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.host = calloc(1, sizeof(struct node_host));
@@ -7484 +7482 @@
 break;
 case 286:
-#line 3027 "../../freebsd/sbin/pfctl/parse.y"
+#line 3028 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if ((yyval.v.host = host(yystack.l_mark[0].v.string)) == NULL)  {
@@ -7497 +7495 @@
 break;
 case 287:
-#line 3037 "../../freebsd/sbin/pfctl/parse.y"
+#line 3038 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host *b, *e;
@@ -7533 +7531 @@
 break;
 case 288:
-#line 3070 "../../freebsd/sbin/pfctl/parse.y"
+#line 3071 "../../freebsd/sbin/pfctl/parse.y"
         {
                         char    *buf;
@@ -7550 +7548 @@
 break;
 case 289:
-#line 3084 "../../freebsd/sbin/pfctl/parse.y"
+#line 3085 "../../freebsd/sbin/pfctl/parse.y"
         {
                         char    *buf;
@@ -7571 +7569 @@
 break;
 case 291:
-#line 3103 "../../freebsd/sbin/pfctl/parse.y"
+#line 3104 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct node_host        *n;
@@ -7585 +7583 @@
 break;
 case 292:
-#line 3114 "../../freebsd/sbin/pfctl/parse.y"
+#line 3115 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (strlen(yystack.l_mark[-1].v.string) >= PF_TABLE_NAME_SIZE) {
@@ -7606 +7604 @@
 break;
 case 294:
-#line 3135 "../../freebsd/sbin/pfctl/parse.y"
+#line 3136 "../../freebsd/sbin/pfctl/parse.y"
         {
                         u_long  ulval;
@@ -7620 +7618 @@
 break;
 case 295:
-#line 3148 "../../freebsd/sbin/pfctl/parse.y"
+#line 3149 "../../freebsd/sbin/pfctl/parse.y"
         {
                         int      flags = 0;
@@ -7675 +7673 @@
 break;
 case 296:
-#line 3202 "../../freebsd/sbin/pfctl/parse.y"
+#line 3203 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.port = yystack.l_mark[0].v.port; }
 break;
 case 297:
-#line 3203 "../../freebsd/sbin/pfctl/parse.y"
+#line 3204 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.port = yystack.l_mark[-1].v.port; }
 break;
 case 298:
-#line 3206 "../../freebsd/sbin/pfctl/parse.y"
+#line 3207 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.port = yystack.l_mark[-1].v.port; }
 break;
 case 299:
-#line 3207 "../../freebsd/sbin/pfctl/parse.y"
+#line 3208 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.port->tail->next = yystack.l_mark[-1].v.port;
@@ -7695 +7693 @@
 break;
 case 300:
-#line 3214 "../../freebsd/sbin/pfctl/parse.y"
+#line 3215 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.port = calloc(1, sizeof(struct node_port));
@@ -7711 +7709 @@
 break;
 case 301:
-#line 3227 "../../freebsd/sbin/pfctl/parse.y"
+#line 3228 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.range.t) {
@@ -7729 +7727 @@
 break;
 case 302:
-#line 3242 "../../freebsd/sbin/pfctl/parse.y"
+#line 3243 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.range.t || yystack.l_mark[0].v.range.t) {
@@ -7747 +7745 @@
 break;
 case 303:
-#line 3259 "../../freebsd/sbin/pfctl/parse.y"
+#line 3260 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, 0) == -1) {
@@ -7757 +7755 @@
 break;
 case 304:
-#line 3268 "../../freebsd/sbin/pfctl/parse.y"
+#line 3269 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, PPORT_RANGE) == -1) {
@@ -7767 +7765 @@
 break;
 case 305:
-#line 3277 "../../freebsd/sbin/pfctl/parse.y"
+#line 3278 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.uid = yystack.l_mark[0].v.uid; }
 break;
 case 306:
-#line 3278 "../../freebsd/sbin/pfctl/parse.y"
+#line 3279 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.uid = yystack.l_mark[-1].v.uid; }
 break;
 case 307:
-#line 3281 "../../freebsd/sbin/pfctl/parse.y"
+#line 3282 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.uid = yystack.l_mark[-1].v.uid; }
 break;
 case 308:
-#line 3282 "../../freebsd/sbin/pfctl/parse.y"
+#line 3283 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.uid->tail->next = yystack.l_mark[-1].v.uid;
@@ -7787 +7785 @@
 break;
 case 309:
-#line 3289 "../../freebsd/sbin/pfctl/parse.y"
+#line 3290 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.uid = calloc(1, sizeof(struct node_uid));
@@ -7800 +7798 @@
 break;
 case 310:
-#line 3299 "../../freebsd/sbin/pfctl/parse.y"
+#line 3300 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number == UID_MAX && yystack.l_mark[-1].v.i != PF_OP_EQ && yystack.l_mark[-1].v.i != PF_OP_NE) {
@@ -7818 +7816 @@
 break;
 case 311:
-#line 3314 "../../freebsd/sbin/pfctl/parse.y"
+#line 3315 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.number == UID_MAX || yystack.l_mark[0].v.number == UID_MAX) {
@@ -7836 +7834 @@
 break;
 case 312:
-#line 3331 "../../freebsd/sbin/pfctl/parse.y"
+#line 3332 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "unknown"))
@@ -7854 +7852 @@
 break;
 case 313:
-#line 3346 "../../freebsd/sbin/pfctl/parse.y"
+#line 3347 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number >= UID_MAX) {
@@ -7864 +7862 @@
 break;
 case 314:
-#line 3355 "../../freebsd/sbin/pfctl/parse.y"
+#line 3356 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.gid = yystack.l_mark[0].v.gid; }
 break;
 case 315:
-#line 3356 "../../freebsd/sbin/pfctl/parse.y"
+#line 3357 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.gid = yystack.l_mark[-1].v.gid; }
 break;
 case 316:
-#line 3359 "../../freebsd/sbin/pfctl/parse.y"
+#line 3360 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.gid = yystack.l_mark[-1].v.gid; }
 break;
 case 317:
-#line 3360 "../../freebsd/sbin/pfctl/parse.y"
+#line 3361 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.gid->tail->next = yystack.l_mark[-1].v.gid;
@@ -7884 +7882 @@
 break;
 case 318:
-#line 3367 "../../freebsd/sbin/pfctl/parse.y"
+#line 3368 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.gid = calloc(1, sizeof(struct node_gid));
@@ -7897 +7895 @@
 break;
 case 319:
-#line 3377 "../../freebsd/sbin/pfctl/parse.y"
+#line 3378 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number == GID_MAX && yystack.l_mark[-1].v.i != PF_OP_EQ && yystack.l_mark[-1].v.i != PF_OP_NE) {
@@ -7915 +7913 @@
 break;
 case 320:
-#line 3392 "../../freebsd/sbin/pfctl/parse.y"
+#line 3393 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.number == GID_MAX || yystack.l_mark[0].v.number == GID_MAX) {
@@ -7933 +7931 @@
 break;
 case 321:
-#line 3409 "../../freebsd/sbin/pfctl/parse.y"
+#line 3410 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "unknown"))
@@ -7951 +7949 @@
 break;
 case 322:
-#line 3424 "../../freebsd/sbin/pfctl/parse.y"
+#line 3425 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number >= GID_MAX) {
@@ -7961 +7959 @@
 break;
 case 323:
-#line 3433 "../../freebsd/sbin/pfctl/parse.y"
+#line 3434 "../../freebsd/sbin/pfctl/parse.y"
         {
                         int     f;
@@ -7975 +7973 @@
 break;
 case 324:
-#line 3446 "../../freebsd/sbin/pfctl/parse.y"
+#line 3447 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = yystack.l_mark[-2].v.b.b1; yyval.v.b.b2 = yystack.l_mark[0].v.b.b1; }
 break;
 case 325:
-#line 3447 "../../freebsd/sbin/pfctl/parse.y"
+#line 3448 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = 0; yyval.v.b.b2 = yystack.l_mark[0].v.b.b1; }
 break;
 case 326:
-#line 3448 "../../freebsd/sbin/pfctl/parse.y"
+#line 3449 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = 0; yyval.v.b.b2 = 0; }
 break;
 case 327:
-#line 3451 "../../freebsd/sbin/pfctl/parse.y"
+#line 3452 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[0].v.icmp; }
 break;
 case 328:
-#line 3452 "../../freebsd/sbin/pfctl/parse.y"
+#line 3453 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 329:
-#line 3453 "../../freebsd/sbin/pfctl/parse.y"
+#line 3454 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[0].v.icmp; }
 break;
 case 330:
-#line 3454 "../../freebsd/sbin/pfctl/parse.y"
+#line 3455 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 331:
-#line 3457 "../../freebsd/sbin/pfctl/parse.y"
+#line 3458 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 332:
-#line 3458 "../../freebsd/sbin/pfctl/parse.y"
+#line 3459 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.icmp->tail->next = yystack.l_mark[-1].v.icmp;
@@ -8015 +8013 @@
 break;
 case 333:
-#line 3465 "../../freebsd/sbin/pfctl/parse.y"
+#line 3466 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.icmp = yystack.l_mark[-1].v.icmp; }
 break;
 case 334:
-#line 3466 "../../freebsd/sbin/pfctl/parse.y"
+#line 3467 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.icmp->tail->next = yystack.l_mark[-1].v.icmp;
@@ -8027 +8025 @@
 break;
 case 335:
-#line 3473 "../../freebsd/sbin/pfctl/parse.y"
+#line 3474 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.icmp = calloc(1, sizeof(struct node_icmp));
@@ -8040 +8038 @@
 break;
 case 336:
-#line 3483 "../../freebsd/sbin/pfctl/parse.y"
+#line 3484 "../../freebsd/sbin/pfctl/parse.y"
         {
                         const struct icmpcodeent        *p;
@@ -8062 +8060 @@
 break;
 case 337:
-#line 3502 "../../freebsd/sbin/pfctl/parse.y"
+#line 3503 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
@@ -8079 +8077 @@
 break;
 case 338:
-#line 3518 "../../freebsd/sbin/pfctl/parse.y"
+#line 3519 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.icmp = calloc(1, sizeof(struct node_icmp));
@@ -8092 +8090 @@
 break;
 case 339:
-#line 3528 "../../freebsd/sbin/pfctl/parse.y"
+#line 3529 "../../freebsd/sbin/pfctl/parse.y"
         {
                         const struct icmpcodeent        *p;
@@ -8114 +8112 @@
 break;
 case 340:
-#line 3547 "../../freebsd/sbin/pfctl/parse.y"
+#line 3548 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
@@ -8131 +8129 @@
 break;
 case 341:
-#line 3563 "../../freebsd/sbin/pfctl/parse.y"
+#line 3564 "../../freebsd/sbin/pfctl/parse.y"
         {
                         const struct icmptypeent        *p;
@@ -8145 +8143 @@
 break;
 case 342:
-#line 3574 "../../freebsd/sbin/pfctl/parse.y"
+#line 3575 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
@@ -8155 +8153 @@
 break;
 case 343:
-#line 3583 "../../freebsd/sbin/pfctl/parse.y"
+#line 3584 "../../freebsd/sbin/pfctl/parse.y"
         {
                         const struct icmptypeent        *p;
@@ -8170 +8168 @@
 break;
 case 344:
-#line 3595 "../../freebsd/sbin/pfctl/parse.y"
+#line 3596 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > 255) {
@@ -8180 +8178 @@
 break;
 case 345:
-#line 3604 "../../freebsd/sbin/pfctl/parse.y"
+#line 3605 "../../freebsd/sbin/pfctl/parse.y"
         {
                         int val;
@@ -8203 +8201 @@
 break;
 case 346:
-#line 3624 "../../freebsd/sbin/pfctl/parse.y"
+#line 3625 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.number = yystack.l_mark[0].v.number;
@@ -8213 +8211 @@
 break;
 case 347:
-#line 3633 "../../freebsd/sbin/pfctl/parse.y"
+#line 3634 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_SRCTRACK; }
 break;
 case 348:
-#line 3634 "../../freebsd/sbin/pfctl/parse.y"
+#line 3635 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_SRCTRACK_GLOBAL; }
 break;
 case 349:
-#line 3635 "../../freebsd/sbin/pfctl/parse.y"
+#line 3636 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_SRCTRACK_RULE; }
 break;
 case 350:
-#line 3638 "../../freebsd/sbin/pfctl/parse.y"
+#line 3639 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.i = PFRULE_IFBOUND;
@@ -8231 +8229 @@
 break;
 case 351:
-#line 3641 "../../freebsd/sbin/pfctl/parse.y"
+#line 3642 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.i = 0;
@@ -8237 +8235 @@
 break;
 case 352:
-#line 3646 "../../freebsd/sbin/pfctl/parse.y"
+#line 3647 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.keep_state.action = 0;
@@ -8244 +8242 @@
 break;
 case 353:
-#line 3650 "../../freebsd/sbin/pfctl/parse.y"
+#line 3651 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.keep_state.action = PF_STATE_NORMAL;
@@ -8251 +8249 @@
 break;
 case 354:
-#line 3654 "../../freebsd/sbin/pfctl/parse.y"
+#line 3655 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.keep_state.action = PF_STATE_MODULATE;
@@ -8258 +8256 @@
 break;
 case 355:
-#line 3658 "../../freebsd/sbin/pfctl/parse.y"
+#line 3659 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.keep_state.action = PF_STATE_SYNPROXY;
@@ -8265 +8263 @@
 break;
 case 356:
-#line 3664 "../../freebsd/sbin/pfctl/parse.y"
+#line 3665 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 0; }
 break;
 case 357:
-#line 3665 "../../freebsd/sbin/pfctl/parse.y"
+#line 3666 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_FLUSH; }
 break;
 case 358:
-#line 3666 "../../freebsd/sbin/pfctl/parse.y"
+#line 3667 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.i = PF_FLUSH | PF_FLUSH_GLOBAL;
@@ -8279 +8277 @@
 break;
 case 359:
-#line 3671 "../../freebsd/sbin/pfctl/parse.y"
+#line 3672 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.state_opt = yystack.l_mark[-1].v.state_opt; }
 break;
 case 360:
-#line 3672 "../../freebsd/sbin/pfctl/parse.y"
+#line 3673 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.state_opt = NULL; }
 break;
 case 361:
-#line 3675 "../../freebsd/sbin/pfctl/parse.y"
+#line 3676 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.state_opt = yystack.l_mark[0].v.state_opt; }
 break;
 case 362:
-#line 3676 "../../freebsd/sbin/pfctl/parse.y"
+#line 3677 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-2].v.state_opt->tail->next = yystack.l_mark[0].v.state_opt;
@@ -8299 +8297 @@
 break;
 case 363:
-#line 3683 "../../freebsd/sbin/pfctl/parse.y"
+#line 3684 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -8315 +8313 @@
 break;
 case 364:
-#line 3696 "../../freebsd/sbin/pfctl/parse.y"
+#line 3697 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
@@ -8326 +8324 @@
 break;
 case 365:
-#line 3704 "../../freebsd/sbin/pfctl/parse.y"
+#line 3705 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -8342 +8340 @@
 break;
 case 366:
-#line 3717 "../../freebsd/sbin/pfctl/parse.y"
+#line 3718 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -8358 +8356 @@
 break;
 case 367:
-#line 3730 "../../freebsd/sbin/pfctl/parse.y"
+#line 3731 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.number < 0 || yystack.l_mark[-2].v.number > UINT_MAX ||
@@ -8376 +8374 @@
 break;
 case 368:
-#line 3745 "../../freebsd/sbin/pfctl/parse.y"
+#line 3746 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (strlen(yystack.l_mark[-2].v.string) >= PF_TABLE_NAME_SIZE) {
@@ -8397 +8395 @@
 break;
 case 369:
-#line 3763 "../../freebsd/sbin/pfctl/parse.y"
+#line 3764 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > UINT_MAX) {
@@ -8413 +8411 @@
 break;
 case 370:
-#line 3776 "../../freebsd/sbin/pfctl/parse.y"
+#line 3777 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
@@ -8425 +8423 @@
 break;
 case 371:
-#line 3785 "../../freebsd/sbin/pfctl/parse.y"
+#line 3786 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
@@ -8437 +8435 @@
 break;
 case 372:
-#line 3794 "../../freebsd/sbin/pfctl/parse.y"
+#line 3795 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.state_opt = calloc(1, sizeof(struct node_state_opt));
@@ -8448 +8446 @@
 break;
 case 373:
-#line 3802 "../../freebsd/sbin/pfctl/parse.y"
+#line 3803 "../../freebsd/sbin/pfctl/parse.y"
         {
                         int     i;
@@ -8481 +8479 @@
 break;
 case 374:
-#line 3834 "../../freebsd/sbin/pfctl/parse.y"
+#line 3835 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.string = yystack.l_mark[0].v.string;
@@ -8487 +8485 @@
 break;
 case 375:
-#line 3839 "../../freebsd/sbin/pfctl/parse.y"
+#line 3840 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.qassign.qname = yystack.l_mark[0].v.string;
@@ -8494 +8492 @@
 break;
 case 376:
-#line 3843 "../../freebsd/sbin/pfctl/parse.y"
+#line 3844 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.qassign.qname = yystack.l_mark[-1].v.string;
@@ -8501 +8499 @@
 break;
 case 377:
-#line 3847 "../../freebsd/sbin/pfctl/parse.y"
+#line 3848 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.qassign.qname = yystack.l_mark[-3].v.string;
@@ -8508 +8506 @@
 break;
 case 378:
-#line 3853 "../../freebsd/sbin/pfctl/parse.y"
+#line 3854 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 0; }
 break;
 case 379:
-#line 3854 "../../freebsd/sbin/pfctl/parse.y"
+#line 3855 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = 1; }
 break;
 case 380:
-#line 3857 "../../freebsd/sbin/pfctl/parse.y"
+#line 3858 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (parseport(yystack.l_mark[0].v.string, &yyval.v.range, PPORT_RANGE|PPORT_STAR) == -1) {
@@ -8526 +8524 @@
 break;
 case 381:
-#line 3866 "../../freebsd/sbin/pfctl/parse.y"
+#line 3867 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 382:
-#line 3867 "../../freebsd/sbin/pfctl/parse.y"
+#line 3868 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 383:
-#line 3870 "../../freebsd/sbin/pfctl/parse.y"
+#line 3871 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 384:
-#line 3871 "../../freebsd/sbin/pfctl/parse.y"
+#line 3872 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yystack.l_mark[-3].v.host->tail->next = yystack.l_mark[-1].v.host;
@@ -8546 +8544 @@
 break;
 case 385:
-#line 3878 "../../freebsd/sbin/pfctl/parse.y"
+#line 3879 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.redirection = NULL; }
 break;
 case 386:
-#line 3879 "../../freebsd/sbin/pfctl/parse.y"
+#line 3880 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.redirection = calloc(1, sizeof(struct redirection));
@@ -8560 +8558 @@
 break;
 case 387:
-#line 3886 "../../freebsd/sbin/pfctl/parse.y"
+#line 3887 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.redirection = calloc(1, sizeof(struct redirection));
@@ -8570 +8568 @@
 break;
 case 388:
-#line 3896 "../../freebsd/sbin/pfctl/parse.y"
+#line 3897 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.hashkey = calloc(1, sizeof(struct pf_poolhashkey));
@@ -8582 +8580 @@
 break;
 case 389:
-#line 3906 "../../freebsd/sbin/pfctl/parse.y"
+#line 3907 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strncmp(yystack.l_mark[0].v.string, "0x", 2)) {
@@ -8622 +8620 @@
 break;
 case 390:
-#line 3945 "../../freebsd/sbin/pfctl/parse.y"
+#line 3946 "../../freebsd/sbin/pfctl/parse.y"
         { bzero(&pool_opts, sizeof pool_opts); }
 break;
 case 391:
-#line 3947 "../../freebsd/sbin/pfctl/parse.y"
+#line 3948 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.pool_opts = pool_opts; }
 break;
 case 392:
-#line 3948 "../../freebsd/sbin/pfctl/parse.y"
+#line 3949 "../../freebsd/sbin/pfctl/parse.y"
         {
                         bzero(&pool_opts, sizeof pool_opts);
@@ -8637 +8635 @@
 break;
 case 395:
-#line 3958 "../../freebsd/sbin/pfctl/parse.y"
+#line 3959 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pool_opts.type) {
@@ -8647 +8645 @@
 break;
 case 396:
-#line 3965 "../../freebsd/sbin/pfctl/parse.y"
+#line 3966 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pool_opts.type) {
@@ -8657 +8655 @@
 break;
 case 397:
-#line 3972 "../../freebsd/sbin/pfctl/parse.y"
+#line 3973 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pool_opts.type) {
@@ -8668 +8666 @@
 break;
 case 398:
-#line 3980 "../../freebsd/sbin/pfctl/parse.y"
+#line 3981 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pool_opts.type) {
@@ -8678 +8676 @@
 break;
 case 399:
-#line 3987 "../../freebsd/sbin/pfctl/parse.y"
+#line 3988 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (pool_opts.staticport) {
@@ -8688 +8686 @@
 break;
 case 400:
-#line 3994 "../../freebsd/sbin/pfctl/parse.y"
+#line 3995 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (filter_opts.marker & POM_STICKYADDRESS) {
@@ -8699 +8697 @@
 break;
 case 401:
-#line 4004 "../../freebsd/sbin/pfctl/parse.y"
+#line 4005 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.redirection = NULL; }
 break;
 case 402:
-#line 4005 "../../freebsd/sbin/pfctl/parse.y"
+#line 4006 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.redirection = calloc(1, sizeof(struct redirection));
@@ -8713 +8711 @@
 break;
 case 403:
-#line 4012 "../../freebsd/sbin/pfctl/parse.y"
+#line 4013 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.redirection = calloc(1, sizeof(struct redirection));
@@ -8723 +8721 @@
 break;
 case 404:
-#line 4021 "../../freebsd/sbin/pfctl/parse.y"
+#line 4022 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = yyval.v.b.b2 = 0; yyval.v.b.w2 = 0; }
 break;
 case 405:
-#line 4022 "../../freebsd/sbin/pfctl/parse.y"
+#line 4023 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = 1; yyval.v.b.b2 = 0; yyval.v.b.w2 = 0; }
 break;
 case 406:
-#line 4023 "../../freebsd/sbin/pfctl/parse.y"
+#line 4024 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = 1; yyval.v.b.b2 = yystack.l_mark[0].v.logquick.log; yyval.v.b.w2 = yystack.l_mark[0].v.logquick.logif; }
 break;
 case 407:
-#line 4024 "../../freebsd/sbin/pfctl/parse.y"
+#line 4025 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.b.b1 = 0; yyval.v.b.b2 = yystack.l_mark[0].v.logquick.log; yyval.v.b.w2 = yystack.l_mark[0].v.logquick.logif; }
 break;
 case 408:
-#line 4027 "../../freebsd/sbin/pfctl/parse.y"
+#line 4028 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.i && yystack.l_mark[0].v.b.b1) {
@@ -8755 +8753 @@
 break;
 case 409:
-#line 4040 "../../freebsd/sbin/pfctl/parse.y"
+#line 4041 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-2].v.i && yystack.l_mark[0].v.b.b1) {
@@ -8771 +8769 @@
 break;
 case 410:
-#line 4057 "../../freebsd/sbin/pfctl/parse.y"
+#line 4058 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule  r;
@@ -8929 +8927 @@
 break;
 case 411:
-#line 4216 "../../freebsd/sbin/pfctl/parse.y"
+#line 4217 "../../freebsd/sbin/pfctl/parse.y"
         {
                         struct pf_rule          binat;
@@ -9095 +9093 @@
 break;
 case 412:
-#line 4381 "../../freebsd/sbin/pfctl/parse.y"
+#line 4382 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.string = NULL; }
 break;
 case 413:
-#line 4382 "../../freebsd/sbin/pfctl/parse.y"
+#line 4383 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.string = yystack.l_mark[0].v.string; }
 break;
 case 414:
-#line 4385 "../../freebsd/sbin/pfctl/parse.y"
+#line 4386 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.tagged.neg = 0; yyval.v.tagged.name = NULL; }
 break;
 case 415:
-#line 4386 "../../freebsd/sbin/pfctl/parse.y"
+#line 4387 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.tagged.neg = yystack.l_mark[-2].v.number; yyval.v.tagged.name = yystack.l_mark[0].v.string; }
 break;
 case 416:
-#line 4389 "../../freebsd/sbin/pfctl/parse.y"
+#line 4390 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.rtableid = -1; }
 break;
 case 417:
-#line 4390 "../../freebsd/sbin/pfctl/parse.y"
+#line 4391 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[0].v.number < 0 || yystack.l_mark[0].v.number > rt_tableid_max()) {
@@ -9125 +9123 @@
 break;
 case 418:
-#line 4399 "../../freebsd/sbin/pfctl/parse.y"
+#line 4400 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.host = calloc(1, sizeof(struct node_host));
@@ -9137 +9135 @@
 break;
 case 419:
-#line 4408 "../../freebsd/sbin/pfctl/parse.y"
+#line 4409 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.host = yystack.l_mark[-1].v.host;
@@ -9144 +9142 @@
 break;
 case 420:
-#line 4414 "../../freebsd/sbin/pfctl/parse.y"
+#line 4415 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 421:
-#line 4415 "../../freebsd/sbin/pfctl/parse.y"
+#line 4416 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (yystack.l_mark[-3].v.host->af == 0)
@@ -9163 +9161 @@
 break;
 case 422:
-#line 4429 "../../freebsd/sbin/pfctl/parse.y"
+#line 4430 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[0].v.host; }
 break;
 case 423:
-#line 4430 "../../freebsd/sbin/pfctl/parse.y"
+#line 4431 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.host = yystack.l_mark[-1].v.host; }
 break;
 case 424:
-#line 4433 "../../freebsd/sbin/pfctl/parse.y"
+#line 4434 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.route.host = NULL;
@@ -9179 +9177 @@
 break;
 case 425:
-#line 4438 "../../freebsd/sbin/pfctl/parse.y"
+#line 4439 "../../freebsd/sbin/pfctl/parse.y"
         {
                         /* backwards-compat */
@@ -9188 +9186 @@
 break;
 case 426:
-#line 4444 "../../freebsd/sbin/pfctl/parse.y"
+#line 4445 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.route.host = yystack.l_mark[-1].v.host;
@@ -9198 +9196 @@
 break;
 case 427:
-#line 4451 "../../freebsd/sbin/pfctl/parse.y"
+#line 4452 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.route.host = yystack.l_mark[-1].v.host;
@@ -9208 +9206 @@
 break;
 case 428:
-#line 4458 "../../freebsd/sbin/pfctl/parse.y"
+#line 4459 "../../freebsd/sbin/pfctl/parse.y"
         {
                         yyval.v.route.host = yystack.l_mark[-1].v.host;
@@ -9218 +9216 @@
 break;
 case 429:
-#line 4468 "../../freebsd/sbin/pfctl/parse.y"
+#line 4469 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION)) {
@@ -9237 +9235 @@
 break;
 case 430:
-#line 4484 "../../freebsd/sbin/pfctl/parse.y"
+#line 4485 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION))
@@ -9250 +9248 @@
 break;
 case 433:
-#line 4501 "../../freebsd/sbin/pfctl/parse.y"
+#line 4502 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (check_rulestate(PFCTL_STATE_OPTION)) {
@@ -9269 +9267 @@
 break;
 case 438:
-#line 4527 "../../freebsd/sbin/pfctl/parse.y"
+#line 4528 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.number = 0; }
 break;
 case 439:
-#line 4528 "../../freebsd/sbin/pfctl/parse.y"
+#line 4529 "../../freebsd/sbin/pfctl/parse.y"
         {
                         if (!strcmp(yystack.l_mark[0].v.string, "yes"))
@@ -9287 +9285 @@
 break;
 case 440:
-#line 4541 "../../freebsd/sbin/pfctl/parse.y"
+#line 4542 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_EQ; }
 break;
 case 441:
-#line 4542 "../../freebsd/sbin/pfctl/parse.y"
+#line 4543 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_NE; }
 break;
 case 442:
-#line 4543 "../../freebsd/sbin/pfctl/parse.y"
+#line 4544 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_LE; }
 break;
 case 443:
-#line 4544 "../../freebsd/sbin/pfctl/parse.y"
+#line 4545 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_LT; }
 break;
 case 444:
-#line 4545 "../../freebsd/sbin/pfctl/parse.y"
+#line 4546 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_GE; }
 break;
 case 445:
-#line 4546 "../../freebsd/sbin/pfctl/parse.y"
+#line 4547 "../../freebsd/sbin/pfctl/parse.y"
         { yyval.v.i = PF_OP_GT; }
 break;
-#line 9313 "pfctly.tab.c"
+#line 9311 "pfctly.tab.c"
     }
     yystack.s_mark -= yym;
@@ -9328 +9326 @@
         if (yychar < 0)
         {
-            if ((yychar = YYLEX) < 0) yychar = YYEOF;
+            yychar = YYLEX;
+            if (yychar < 0) yychar = YYEOF;
 #if YYDEBUG
             if (yydebug)
             {
-                yys = yyname[YYTRANSLATE(yychar)];
+                if ((yys = yyname[YYTRANSLATE(yychar)]) == NULL) yys = yyname[YYUNDFTOKEN];
                 printf("%sdebug: state %d, reading %d (%s)\n",
                         YYPREFIX, YYFINAL, yychar, yys);
@@ -9341 +9340 @@
         goto yyloop;
     }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
+    if (((yyn = yygindex[yym]) != 0) && (yyn += yystate) >= 0 &&
+            yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yystate)
         yystate = yytable[yyn];
     else
@@ -9351 +9350 @@
 to state %d\n", YYPREFIX, *yystack.s_mark, yystate);
 #endif
-    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM)
-    {
-        goto yyoverflow;
-    }
+    if (yystack.s_mark >= yystack.s_last && yygrowstack(&yystack) == YYENOMEM) goto yyoverflow;
     *++yystack.s_mark = (YYINT) yystate;
     *++yystack.l_mark = yyval;

freebsd/sbin/pfctl/parse.y

@@ -30 +30 @@
 #ifdef __rtems__
 #include <machine/rtems-bsd-user-space.h>
+#undef INET6
 #endif /* __rtems__ */