diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-08 16:44:16 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2002-06-08 16:44:16 +0000 |
| commit | 135a8fbf4e6e4f0bf13676431f01af429c6d10b3 (patch) | |
| tree | 1af8022700587f7797f38fc8d9289c1370de14ea /sbin/pfctl | |
| parent | 6f83e8287979a550a31e8f5aece753b018d5c828 (diff) | |
pf_timeouts is shared between pfctl and authpf, put it in the shared file.
unbreak build.
Diffstat (limited to 'sbin/pfctl')
| -rw-r--r-- | sbin/pfctl/pfctl.c | 22 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 9a31c58dea2..48df9a78569 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.70 2002/06/08 07:58:07 dhartmei Exp $ */ +/* $OpenBSD: pfctl.c,v 1.71 2002/06/08 16:44:15 drahn Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -92,26 +92,6 @@ char *state_kill[2]; char *infile; -const struct pf_timeout pf_timeouts[] = { - { "tcp.first", PFTM_TCP_FIRST_PACKET }, - { "tcp.opening", PFTM_TCP_OPENING }, - { "tcp.established", PFTM_TCP_ESTABLISHED }, - { "tcp.closing", PFTM_TCP_CLOSING }, - { "tcp.finwait", PFTM_TCP_FIN_WAIT }, - { "tcp.closed", PFTM_TCP_CLOSED }, - { "udp.first", PFTM_UDP_FIRST_PACKET }, - { "udp.single", PFTM_UDP_SINGLE }, - { "udp.multiple", PFTM_UDP_MULTIPLE }, - { "icmp.first", PFTM_ICMP_FIRST_PACKET }, - { "icmp.error", PFTM_ICMP_ERROR_REPLY }, - { "other.first", PFTM_OTHER_FIRST_PACKET }, - { "other.single", PFTM_OTHER_SINGLE }, - { "other.multiple", PFTM_OTHER_MULTIPLE }, - { "frag", PFTM_FRAG }, - { "interval", PFTM_INTERVAL }, - { NULL, 0 } -}; - static const struct { const char *name; int index; diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index a11f13a42f8..4be917f3b4b 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.80 2002/06/08 07:58:07 dhartmei Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.81 2002/06/08 16:44:15 drahn Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -166,6 +166,26 @@ struct icmpcodeent icmp6_code[] = { { "redirrouter", ND_REDIRECT, ND_REDIRECT_ROUTER } }; +const struct pf_timeout pf_timeouts[] = { + { "tcp.first", PFTM_TCP_FIRST_PACKET }, + { "tcp.opening", PFTM_TCP_OPENING }, + { "tcp.established", PFTM_TCP_ESTABLISHED }, + { "tcp.closing", PFTM_TCP_CLOSING }, + { "tcp.finwait", PFTM_TCP_FIN_WAIT }, + { "tcp.closed", PFTM_TCP_CLOSED }, + { "udp.first", PFTM_UDP_FIRST_PACKET }, + { "udp.single", PFTM_UDP_SINGLE }, + { "udp.multiple", PFTM_UDP_MULTIPLE }, + { "icmp.first", PFTM_ICMP_FIRST_PACKET }, + { "icmp.error", PFTM_ICMP_ERROR_REPLY }, + { "other.first", PFTM_OTHER_FIRST_PACKET }, + { "other.single", PFTM_OTHER_SINGLE }, + { "other.multiple", PFTM_OTHER_MULTIPLE }, + { "frag", PFTM_FRAG }, + { "interval", PFTM_INTERVAL }, + { NULL, 0 } +}; + struct icmptypeent * geticmptypebynumber(u_int8_t type, u_int8_t af) { |