diff options
| author | Shota Fukumori <her@sorah.jp> | 2016-03-13 00:05:01 +0900 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-03-23 14:45:04 +0100 |
| commit | b210369314cd1e0f889fd1b73dae4d45baa968a8 (patch) | |
| tree | ff919fa46660912ed206aef19de6322455287c92 | |
| parent | b39be996ccbae8252f2e44265cdd7dcda7835fc2 (diff) | |
| download | strongswan-b210369314cd1e0f889fd1b73dae4d45baa968a8.tar.bz2 strongswan-b210369314cd1e0f889fd1b73dae4d45baa968a8.tar.xz | |
updown: Get value for PLUTO_MARK_{IN,OUT} from CHILD_SA
Or the invoked script will get a broken value when `mark=%unique` is
used in a configuration.
Closes strongswan/strongswan#37.
| -rw-r--r-- | src/libcharon/plugins/updown/updown_listener.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcharon/plugins/updown/updown_listener.c b/src/libcharon/plugins/updown/updown_listener.c index e51caab10..a9b0565a8 100644 --- a/src/libcharon/plugins/updown/updown_listener.c +++ b/src/libcharon/plugins/updown/updown_listener.c @@ -344,13 +344,13 @@ static void invoke_once(private_updown_listener_t *this, ike_sa_t *ike_sa, } push_vip_env(this, ike_sa, envp, countof(envp), TRUE); push_vip_env(this, ike_sa, envp, countof(envp), FALSE); - mark = config->get_mark(config, TRUE); + mark = child_sa->get_mark(child_sa, TRUE); if (mark.value) { push_env(envp, countof(envp), "PLUTO_MARK_IN=%u/0x%08x", mark.value, mark.mask); } - mark = config->get_mark(config, FALSE); + mark = child_sa->get_mark(child_sa, FALSE); if (mark.value) { push_env(envp, countof(envp), "PLUTO_MARK_OUT=%u/0x%08x", |