diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2010-07-19 11:25:47 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2010-09-02 19:04:19 +0200 |
| commit | b4872c1e0963010525ff24c9562e26097fdd0d1b (patch) | |
| tree | ad7d389669ee620870c911f12c874a8c6ccd1600 /src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c | |
| parent | c5fb6882f2f74ae347d7937f2fc3eb3bad4a4466 (diff) | |
| download | strongswan-b4872c1e0963010525ff24c9562e26097fdd0d1b.tar.bz2 strongswan-b4872c1e0963010525ff24c9562e26097fdd0d1b.tar.xz | |
Replaced the protocol argument in add_policy with an optional SPI for an AH SA.
Diffstat (limited to 'src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c')
| -rw-r--r-- | src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c index 6ecfa03e3..3fd78626b 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -1617,7 +1617,7 @@ METHOD(kernel_ipsec_t, update_sa, status_t, METHOD(kernel_ipsec_t, add_policy, status_t, private_kernel_netlink_ipsec_t *this, host_t *src, host_t *dst, traffic_selector_t *src_ts, traffic_selector_t *dst_ts, - policy_dir_t direction, u_int32_t spi, u_int8_t protocol, + policy_dir_t direction, u_int32_t spi, u_int32_t ah_spi, u_int32_t reqid, mark_t mark, ipsec_mode_t mode, u_int16_t ipcomp, u_int16_t cpi, bool routed) { @@ -1749,7 +1749,7 @@ METHOD(kernel_ipsec_t, add_policy, status_t, } tmpl->reqid = reqid; - tmpl->id.proto = protocol; + tmpl->id.proto = spi ? IPPROTO_ESP : IPPROTO_AH; tmpl->aalgos = tmpl->ealgos = tmpl->calgos = ~0; tmpl->mode = mode2kernel(mode); tmpl->family = src->get_family(src); @@ -1943,7 +1943,7 @@ METHOD(kernel_ipsec_t, query_policy, status_t, METHOD(kernel_ipsec_t, del_policy, status_t, private_kernel_netlink_ipsec_t *this, traffic_selector_t *src_ts, - traffic_selector_t *dst_ts, policy_dir_t direction, mark_t mark, + traffic_selector_t *dst_ts, policy_dir_t direction, mark_t mark, bool unrouted) { policy_entry_t *current, policy, *to_delete = NULL; |