diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 1999-08-10 11:35:27 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 1999-08-10 11:35:27 +0000 |
| commit | 6b9957a8038b645f5984d1b4eb10013c4ce17a19 (patch) | |
| tree | 2401a52c24e06d3c94b84f850b94711513cc3852 | |
| parent | 7056109a961e346413653d18dbbd0ddf6fab661f (diff) | |
Add tdb_satype (PF_KEY SADB_SATYPE_<XXX>) to struct tdb
| -rw-r--r-- | sys/netinet/ip_ipsp.c | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 5e4eb4fea11..ef4966372bb 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.52 1999/08/05 21:58:15 ho Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.53 1999/08/10 11:35:26 ho Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -406,6 +406,7 @@ reserve_spi(u_int32_t sspi, u_int32_t tspi, union sockaddr_union *src, bcopy(&src->sa, &tdbp->tdb_src.sa, SA_LEN(&src->sa)); tdbp->tdb_sproto = sproto; tdbp->tdb_flags |= TDBF_INVALID; /* Mark SA as invalid for now */ + tdbp->tdb_satype = SADB_SATYPE_UNSPEC; tdbp->tdb_established = time.tv_sec; tdbp->tdb_epoch = kernfs_epoch - 1; puttdb(tdbp); diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index 6b6146d55b0..70d404137aa 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.40 1999/08/05 21:58:15 ho Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.41 1999/08/10 11:35:26 ho Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -251,7 +251,8 @@ struct tdb /* tunnel descriptor block */ u_int16_t tdb_ivlen; /* IV length */ u_int8_t tdb_sproto; /* IPsec protocol */ u_int8_t tdb_wnd; /* Replay window */ - u_int16_t tdb_FILLER; /* Padding */ + u_int8_t tdb_satype; /* SA type (RFC2367, PF_KEY) */ + u_int8_t tdb_FILLER; /* Padding */ union sockaddr_union tdb_dst; /* Destination address for this SA */ union sockaddr_union tdb_src; /* Source address for this SA */ |