parse.y (b4e3f3c2de6e6dc614f99615e50d0d87f3367ca0) | parse.y (0d71f9f36e6c1849fdaf6c1edc1178be07357034) |
---|---|
1/* $OpenBSD: parse.y,v 1.554 2008/10/17 12:59:53 henning Exp $ */ 2 3/*- 4 * SPDX-License-Identifier: BSD-2-Clause 5 * 6 * Copyright (c) 2001 Markus Friedl. All rights reserved. 7 * Copyright (c) 2001 Daniel Hartmeier. All rights reserved. 8 * Copyright (c) 2001 Theo de Raadt. All rights reserved. --- 1026 unchanged lines hidden (view full) --- 1035 yyerror("fromto parameter not supported" 1036 " in binat-anchor"); 1037 YYERROR; 1038 } 1039 1040 decide_address_family($6.src.host, &r.af); 1041 decide_address_family($6.dst.host, &r.af); 1042 | 1/* $OpenBSD: parse.y,v 1.554 2008/10/17 12:59:53 henning Exp $ */ 2 3/*- 4 * SPDX-License-Identifier: BSD-2-Clause 5 * 6 * Copyright (c) 2001 Markus Friedl. All rights reserved. 7 * Copyright (c) 2001 Daniel Hartmeier. All rights reserved. 8 * Copyright (c) 2001 Theo de Raadt. All rights reserved. --- 1026 unchanged lines hidden (view full) --- 1035 yyerror("fromto parameter not supported" 1036 " in binat-anchor"); 1037 YYERROR; 1038 } 1039 1040 decide_address_family($6.src.host, &r.af); 1041 decide_address_family($6.dst.host, &r.af); 1042 |
1043 pfctl_add_rule(pf, &r, $2); | 1043 pfctl_append_rule(pf, &r, $2); |
1044 free($2); 1045 } 1046 ; 1047 1048loadrule : LOAD ANCHOR string FROM string { 1049 struct loadanchors *loadanchor; 1050 1051 if (strlen(pf->anchor->name) + 1 + --- 3333 unchanged lines hidden (view full) --- 4385 pa->addr = $13->host->addr; 4386 pa->ifname[0] = 0; 4387 TAILQ_INSERT_TAIL(&binat.rpool.list, 4388 pa, entries); 4389 4390 free($13); 4391 } 4392 | 1044 free($2); 1045 } 1046 ; 1047 1048loadrule : LOAD ANCHOR string FROM string { 1049 struct loadanchors *loadanchor; 1050 1051 if (strlen(pf->anchor->name) + 1 + --- 3333 unchanged lines hidden (view full) --- 4385 pa->addr = $13->host->addr; 4386 pa->ifname[0] = 0; 4387 TAILQ_INSERT_TAIL(&binat.rpool.list, 4388 pa, entries); 4389 4390 free($13); 4391 } 4392 |
4393 pfctl_add_rule(pf, &binat, ""); | 4393 pfctl_append_rule(pf, &binat, ""); |
4394 } 4395 ; 4396 4397tag : /* empty */ { $$ = NULL; } 4398 | TAG STRING { $$ = $2; } 4399 ; 4400 4401tagged : /* empty */ { $$.neg = 0; $$.name = NULL; } --- 1000 unchanged lines hidden (view full) --- 5402 pa->ifname[0] = 0; 5403 TAILQ_INSERT_TAIL(&r->rpool.list, pa, entries); 5404 } 5405 5406 if (rule_consistent(r, anchor_call[0]) < 0 || error) 5407 yyerror("skipping rule due to errors"); 5408 else { 5409 r->nr = pf->astack[pf->asd]->match++; | 4394 } 4395 ; 4396 4397tag : /* empty */ { $$ = NULL; } 4398 | TAG STRING { $$ = $2; } 4399 ; 4400 4401tagged : /* empty */ { $$.neg = 0; $$.name = NULL; } --- 1000 unchanged lines hidden (view full) --- 5402 pa->ifname[0] = 0; 5403 TAILQ_INSERT_TAIL(&r->rpool.list, pa, entries); 5404 } 5405 5406 if (rule_consistent(r, anchor_call[0]) < 0 || error) 5407 yyerror("skipping rule due to errors"); 5408 else { 5409 r->nr = pf->astack[pf->asd]->match++; |
5410 pfctl_add_rule(pf, r, anchor_call); | 5410 pfctl_append_rule(pf, r, anchor_call); |
5411 added++; 5412 } 5413 5414 )))))))))); 5415 5416 FREE_LIST(struct node_if, interfaces); 5417 FREE_LIST(struct node_proto, protos); 5418 FREE_LIST(struct node_host, src_hosts); --- 960 unchanged lines hidden --- | 5411 added++; 5412 } 5413 5414 )))))))))); 5415 5416 FREE_LIST(struct node_if, interfaces); 5417 FREE_LIST(struct node_proto, protos); 5418 FREE_LIST(struct node_host, src_hosts); --- 960 unchanged lines hidden --- |