diff options
| author | Martin Willi <martin@revosec.ch> | 2014-06-06 16:32:31 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-06 16:33:50 +0200 |
| commit | 4f31b3f7243d4d368ac88bda6af477e542d77aae (patch) | |
| tree | 1e931ba67796aece980de91caa301cb2ae196ed6 /src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c | |
| parent | 9d228ddb04b7adc7c5904b98bc7857b12176904a (diff) | |
| parent | fd372e13a238180102168770ff8e60c82ba59da2 (diff) | |
| download | strongswan-4f31b3f7243d4d368ac88bda6af477e542d77aae.tar.bz2 strongswan-4f31b3f7243d4d368ac88bda6af477e542d77aae.tar.xz | |
Merge branch 'win-32bit'
Fixes some issues when building 32-bit Windows binaries. Mostly related
to the call API. Introduces a Travis 32-bit Windows build variant.
Diffstat (limited to 'src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c')
| -rw-r--r-- | src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c index 5b44f85b5..62b3ea8dd 100644 --- a/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c +++ b/src/libcharon/plugins/kernel_wfp/kernel_wfp_ipsec.c @@ -1545,9 +1545,9 @@ static traffic_selector_t *addr2ts(FWP_IP_VERSION version, void *data, /** * FwpmNetEventSubscribe0() callback */ -static void event_callback(private_kernel_wfp_ipsec_t *this, - const FWPM_NET_EVENT1 *event) +static void WINAPI event_callback(void *user, const FWPM_NET_EVENT1 *event) { + private_kernel_wfp_ipsec_t *this = user; traffic_selector_t *local = NULL, *remote = NULL; u_int8_t protocol = 0; u_int16_t from_local = 0, to_local = 65535; @@ -1610,7 +1610,7 @@ static bool register_events(private_kernel_wfp_ipsec_t *this) DWORD res; res = FwpmNetEventSubscribe0(this->handle, &subscription, - (void*)event_callback, this, &this->event); + event_callback, this, &this->event); if (res != ERROR_SUCCESS) { DBG1(DBG_KNL, "registering for WFP events failed: 0x%08x", res); |