diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2007-06-22 12:14:06 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2007-06-22 12:14:06 +0000 |
| commit | 38b1d81e07a94968e98215f92a88b8d00a0e62c5 (patch) | |
| tree | ecdaf0d0fc852511c9dfd7965d83526628638ea5 /sys/net | |
| parent | 30ed18c263cb54e972c8e1f8f07c4efa5333aa79 (diff) | |
export the flow/filter information attached to the SA, too; ok hshoexer@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pfkeyv2.c | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c index 20425502e29..0e007102c00 100644 --- a/sys/net/pfkeyv2.c +++ b/sys/net/pfkeyv2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2.c,v 1.114 2007/02/14 00:53:48 jsg Exp $ */ +/* $OpenBSD: pfkeyv2.c,v 1.115 2007/06/22 12:14:05 markus Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) 17 January 1995 @@ -556,6 +556,29 @@ pfkeyv2_get(struct tdb *sa, void **headers, void **buffer, int *lenp) if (sa->tdb_emxkey) i+= PADUP(sa->tdb_emxkeylen) + sizeof(struct sadb_key); + if (sa->tdb_filter.sen_type) { + i += 2 * sizeof(struct sadb_protocol); + + /* We'll need four of them: src, src mask, dst, dst mask. */ + switch (sa->tdb_filter.sen_type) { +#ifdef INET + case SENT_IP4: + i += 4 * PADUP(sizeof(struct sockaddr_in)); + i += 4 * sizeof(struct sadb_address); + break; +#endif /* INET */ +#ifdef INET6 + case SENT_IP6: + i += 4 * PADUP(sizeof(struct sockaddr_in6)); + i += 4 * sizeof(struct sadb_address); + break; +#endif /* INET6 */ + default: + rval = EINVAL; + goto ret; + } + } + if (sa->tdb_udpencap_port) i+= sizeof(struct sadb_x_udpencap); @@ -665,6 +688,11 @@ pfkeyv2_get(struct tdb *sa, void **headers, void **buffer, int *lenp) export_key(&p, sa, PFKEYV2_ENCRYPTION_KEY); } + /* Export flow/filter, if present */ + if (sa->tdb_filter.sen_type) + export_flow(&p, IPSP_IPSEC_USE, &sa->tdb_filter, + &sa->tdb_filtermask, headers); + /* Export UDP encapsulation port, if present */ if (sa->tdb_udpencap_port) { headers[SADB_X_EXT_UDPENCAP] = p; |