diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-08-05 14:09:28 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-08-05 14:09:28 +0000 |
| commit | 5396c766dc396ccea2ddd4b5f0a803113f4d01e2 (patch) | |
| tree | 2ccda0c2a90546a8da47f33940d2de4c75880f46 /sbin/ipsecctl | |
| parent | bc1bdab07cf436a1161a0eec8692d7d4676eca76 (diff) | |
simplify a bit.
Diffstat (limited to 'sbin/ipsecctl')
| -rw-r--r-- | sbin/ipsecctl/parse.y | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y index a1a1cf245dd..802d6f22367 100644 --- a/sbin/ipsecctl/parse.y +++ b/sbin/ipsecctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.15 2005/08/02 15:47:25 hshoexer Exp $ */ +/* $OpenBSD: parse.y,v 1.16 2005/08/05 14:09:27 hshoexer Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -160,9 +160,6 @@ number : STRING { free($1); } -flowrule : FLOW ipsecrule { } - ; - tcpmd5rule : TCPMD5 hosts spispec keyspec { struct ipsec_rule *r; @@ -187,25 +184,25 @@ tcpmd5rule : TCPMD5 hosts spispec keyspec { } ; -ipsecrule : protocol dir hosts peer ids authtype { +flowrule : FLOW protocol dir hosts peer ids authtype { struct ipsec_rule *r; - r = create_flow($2, $3.src, $3.dst, $4, $1, $5.srcid, - $5.dstid, $6); + r = create_flow($3, $4.src, $4.dst, $5, $2, $6.srcid, + $6.dstid, $7); if (r == NULL) YYERROR; r->nr = ipsec->rule_nr++; if (ipsecctl_add_rule(ipsec, r)) - errx(1, "ipsecrule: ipsecctl_add_rule"); + errx(1, "flowrule: ipsecctl_add_rule"); /* Create and add reverse flow rule. */ - if ($2 == IPSEC_INOUT) { + if ($3 == IPSEC_INOUT) { r = reverse_rule(r); r->nr = ipsec->rule_nr++; if (ipsecctl_add_rule(ipsec, r)) - errx(1, "ipsecrule: ipsecctl_add_rule"); + errx(1, "flowrule: ipsecctl_add_rule"); } } ; |