Skip to content

Commit

Permalink
datapath-windows: Fix conntrack event handler
Browse files Browse the repository at this point in the history
Fix an issue with the OvsReadEventCmdHandler when handling conntrack
events. Driver initiated messages should have zero seq number.

Reverting the previous review comment since the inputBuffer in
this case will be NULL.

Signed-off-by: Sairam Venugopal <[email protected]>
Acked-by: Nithin Raju <[email protected]>
Signed-off-by: Gurucharan Shetty <[email protected]>
  • Loading branch information
Sairam Venugopal authored and shettyg committed Sep 12, 2016
1 parent 1cb0f53 commit 4eb67d3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions datapath-windows/ovsext/Datapath.c
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,6 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
UINT32 *replyLen)
{
POVS_MESSAGE msgOut = (POVS_MESSAGE)usrParamsCtx->outputBuffer;
POVS_MESSAGE msgIn = (POVS_MESSAGE)usrParamsCtx->inputBuffer;
POVS_OPEN_INSTANCE instance =
(POVS_OPEN_INSTANCE)usrParamsCtx->ovsInstance;
NL_BUFFER nlBuf;
Expand Down Expand Up @@ -1708,11 +1707,12 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
goto cleanup;
}

/* Driver intiated messages should have zero seq number */
status = OvsCreateNlMsgFromCtEntry(&ctEventEntry.entry,
usrParamsCtx->outputBuffer,
usrParamsCtx->outputLength,
ctEventEntry.type,
msgIn->nlMsg.nlmsgSeq,
0, /* No input msg */
usrParamsCtx->ovsInstance->pid,
NFNETLINK_V0,
gOvsSwitchContext->dpNo);
Expand Down

0 comments on commit 4eb67d3

Please sign in to comment.