diff options
| author | Martin Willi <martin@revosec.ch> | 2014-11-13 15:26:10 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2015-02-20 13:34:49 +0100 |
| commit | 85b238887d01c030a7d9240db2031601211a6283 (patch) | |
| tree | 00fc12e7d87c136d4572d69afd98384e2b8e5118 /src/libhydra/kernel/kernel_interface.h | |
| parent | 4ec397b89431576813f9a7511bf297ee312a5878 (diff) | |
| download | strongswan-85b238887d01c030a7d9240db2031601211a6283.tar.bz2 strongswan-85b238887d01c030a7d9240db2031601211a6283.tar.xz | |
child-sa: Replace reqid based marks by "unique" marks
As we now use the same reqid for multiple CHILD_SAs with the same selectors,
having marks based on the reqid makes not that much sense anymore. Instead we
use unique marks that use a custom identifier. This identifier is reused during
rekeying, keeping the marks constant for any rule relying on it (for example
installed by updown).
This also simplifies handling of reqid allocation, as we do not have to query
the marks that is not yet assigned for an unknown reqid.
Diffstat (limited to 'src/libhydra/kernel/kernel_interface.h')
| -rw-r--r-- | src/libhydra/kernel/kernel_interface.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libhydra/kernel/kernel_interface.h b/src/libhydra/kernel/kernel_interface.h index f25c10830..9a86e78d6 100644 --- a/src/libhydra/kernel/kernel_interface.h +++ b/src/libhydra/kernel/kernel_interface.h @@ -131,9 +131,6 @@ struct kernel_interface_t { * the reqid is confirmed and registered for use. If it points to zero, * a reqid is allocated for the given selectors, and returned to reqid. * - * The passed mark values get updated to the reqid value if they are set - * to the magic value MARK_REQID. - * * @param local_ts traffic selectors of local side for SA * @param remote_ts traffic selectors of remote side for SA * @param mark_in inbound mark on SA @@ -143,7 +140,7 @@ struct kernel_interface_t { */ status_t (*alloc_reqid)(kernel_interface_t *this, linked_list_t *local_ts, linked_list_t *remote_ts, - mark_t *mark_in, mark_t *mark_out, + mark_t mark_in, mark_t mark_out, u_int32_t *reqid); /** |