From: Sorin Vinturis Date: Thu, 18 Jun 2015 18:37:13 +0000 (+0000) Subject: datapath-windows: Return success for already existing WFP objects X-Git-Tag: v2.4.0~75 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=cecc36ef103627fb7fe53d235522a8c0fdad7a61 datapath-windows: Return success for already existing WFP objects There are cases when the WFP callout or sublayer, being persistent objects, already exists when we try to register the OVS callout. In this cases, when trying to add again these WFP objects the return code is STATUS_FWP_ALREADY_EXISTS, which we are interpreting as an error. This is incorrect and this patch changes that. Signed-off-by: Sorin Vinturis Reported-by: Sorin Vinturis Reported-at: https://github.com/openvswitch/ovs-issues/issues/84 Signed-off-by: Ben Pfaff --- diff --git a/datapath-windows/ovsext/TunnelFilter.c b/datapath-windows/ovsext/TunnelFilter.c index 08cc13f34..231750e46 100644 --- a/datapath-windows/ovsext/TunnelFilter.c +++ b/datapath-windows/ovsext/TunnelFilter.c @@ -414,7 +414,12 @@ OvsTunnelRegisterDatagramDataCallouts(const GUID *layerKey, status = FwpmCalloutAdd(gEngineHandle, &mCallout, NULL, NULL); if (!NT_SUCCESS(status)) { - goto Exit; + if (STATUS_FWP_ALREADY_EXISTS != status) { + OVS_LOG_ERROR("Failed to add WFP callout, status: %x.", + status); + goto Exit; + } + status = STATUS_SUCCESS; } Exit: @@ -459,7 +464,11 @@ OvsTunnelRegisterCallouts(VOID *deviceObject) status = FwpmSubLayerAdd(gEngineHandle, &OvsTunnelSubLayer, NULL); if (!NT_SUCCESS(status)) { - goto Exit; + if (STATUS_FWP_ALREADY_EXISTS != status) { + OVS_LOG_ERROR("Failed to add WFP sublayer, status: %x.", + status); + goto Exit; + } } /* In order to use this callout a socket must be opened. */