diff options
| author |   markus <markus@openbsd.org> | 2004-01-28 14:24:29 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2004-01-28 14:24:29 +0000 |
| commit | 1ef0c4eac11e87e7c946fe0e7635f80fc76b3700 (patch) | |
| tree | 17a93a146085c798e0e5088cfa4aa92539d702c1 | |
| parent | toast long line (diff) | |
| download | wireguard-openbsd-1ef0c4eac11e87e7c946fe0e7635f80fc76b3700.tar.xz wireguard-openbsd-1ef0c4eac11e87e7c946fe0e7635f80fc76b3700.zip | |
initial support for SADB_DELETE; ok hshoexer
| -rw-r--r-- | usr.sbin/bgpd/pfkey.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/usr.sbin/bgpd/pfkey.c b/usr.sbin/bgpd/pfkey.c index 6b3337e089b..a97dca91630 100644 --- a/usr.sbin/bgpd/pfkey.c +++ b/usr.sbin/bgpd/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.5 2004/01/28 11:03:32 markus Exp $ */ +/* $OpenBSD: pfkey.c,v 1.6 2004/01/28 14:24:29 markus Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -107,13 +107,27 @@ pfkey_send(int sd, uint8_t mtype, struct bgpd_addr *src, break; case SADB_ADD: case SADB_UPDATE: + case SADB_DELETE: bzero(&sa, sizeof(sa)); sa.sadb_sa_exttype = SADB_EXT_SA; sa.sadb_sa_len = sizeof(sa) / 8; sa.sadb_sa_replay = 0; sa.sadb_sa_spi = spi; sa.sadb_sa_state = SADB_SASTATE_MATURE; + break; + } + + bzero(&sa_src, sizeof(sa_src)); + sa_src.sadb_address_exttype = SADB_EXT_ADDRESS_SRC; + sa_src.sadb_address_len = (sizeof(sa_src) + ROUNDUP(ssrc.ss_len)) / 8; + bzero(&sa_dst, sizeof(sa_dst)); + sa_dst.sadb_address_exttype = SADB_EXT_ADDRESS_DST; + sa_dst.sadb_address_len = (sizeof(sa_dst) + ROUNDUP(sdst.ss_len)) / 8; + + switch (mtype) { + case SADB_ADD: + case SADB_UPDATE: bzero(&sa_key, sizeof(sa_key)); klen = strlen(key) / 2; sa_key.sadb_key_exttype = SADB_EXT_KEY_AUTH; @@ -134,14 +148,6 @@ pfkey_send(int sd, uint8_t mtype, struct bgpd_addr *src, break; } - bzero(&sa_src, sizeof(sa_src)); - sa_src.sadb_address_exttype = SADB_EXT_ADDRESS_SRC; - sa_src.sadb_address_len = (sizeof(sa_src) + ROUNDUP(ssrc.ss_len)) / 8; - - bzero(&sa_dst, sizeof(sa_dst)); - sa_dst.sadb_address_exttype = SADB_EXT_ADDRESS_DST; - sa_dst.sadb_address_len = (sizeof(sa_dst) + ROUNDUP(sdst.ss_len)) / 8; - iov_cnt = 0; /* msghdr */ @@ -152,6 +158,7 @@ pfkey_send(int sd, uint8_t mtype, struct bgpd_addr *src, switch (mtype) { case SADB_ADD: case SADB_UPDATE: + case SADB_DELETE: /* SA hdr */ iov[iov_cnt].iov_base = &sa; iov[iov_cnt].iov_len = sizeof(sa); |