diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-27 22:42:14 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-27 22:42:14 +0000 |
| commit | 4ce8f40e32b7e5c6fe38f1317c3a4ab02541ecbf (patch) | |
| tree | 2aa446ec9aa0425332c62b175ce348103fd2237b /usr.sbin/bgpd/bgpd.h | |
| parent | 952562b1234b6166a0d863ba84fcf438a935d011 (diff) | |
rename the ipsec struct to auth, move all tcpmd5 related fields in there, and
add a generic "method" field that expresses what method
(none/md5sig/ipsec manual/ipsec ike) is in use
markus ok
Diffstat (limited to 'usr.sbin/bgpd/bgpd.h')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index 5dd0b7547ea..c5e9d24bd75 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.113 2004/04/27 22:06:54 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.114 2004/04/27 22:42:13 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -153,8 +153,9 @@ enum auth_method { IPSEC_IKE }; -struct peer_ipsec { +struct peer_auth { enum auth_method method; + char md5key[TCP_MD5_KEY_LEN]; u_int32_t spi_in; u_int32_t spi_out; u_int8_t auth_alg_in; @@ -191,8 +192,7 @@ struct peer_config { struct filter_set attrset; enum announce_type announce_type; enum enforce_as enforce_as; - char tcp_md5_key[TCP_MD5_KEY_LEN]; - struct peer_ipsec ipsec; + struct peer_auth auth; u_int8_t capabilities; enum reconf_action reconf_action; }; |