Acked-by: Sorin Vinturis <svintu...@cloudbasesolutions.com> -----Original Message----- From: dev [mailto:dev-boun...@openvswitch.org] On Behalf Of Ankur Sharma Sent: Wednesday, 3 December, 2014 02:23 To: Eitan Eliahu; dev@openvswitch.org Subject: Re: [ovs-dev] [PATCH] datapath-windows: Add PID Number attribute for port notification / Fix logic
Acked-by: Ankur Sharma <ankursha...@vmware.com> ________________________________________ From: dev <dev-boun...@openvswitch.org> on behalf of Eitan Eliahu <elia...@vmware.com> Sent: Tuesday, December 2, 2014 8:33 PM To: dev@openvswitch.org Subject: [ovs-dev] [PATCH] datapath-windows: Add PID Number attribute for port notification / Fix logic [1] User mode OVS expects to have the PID number in the port state notification command [2] Fix logic error-for-Windows-user-mode Signed-off-by: Eitan Eliahu <elia...@vmware.com> --- datapath-windows/ovsext/Datapath.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index b9d97f8..0a8ddc5 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -2148,7 +2148,7 @@ OvsPortFillInfo(POVS_USER_PARAMS_CONTEXT usrParamsCtx, PNL_BUFFER nlBuf) { NTSTATUS status; - BOOLEAN rc; + BOOLEAN ok; OVS_MESSAGE msgOutTmp; PNL_MSG_HDR nlMsg; POVS_VPORT_ENTRY vport; @@ -2177,8 +2177,8 @@ OvsPortFillInfo(POVS_USER_PARAMS_CONTEXT usrParamsCtx, } msgOutTmp.ovsHdr.dp_ifindex = gOvsSwitchContext->dpNo; - rc = NlMsgPutHead(nlBuf, (PCHAR)&msgOutTmp, sizeof msgOutTmp); - if (!rc) { + ok = NlMsgPutHead(nlBuf, (PCHAR)&msgOutTmp, sizeof msgOutTmp); + if (!ok) { status = STATUS_INVALID_BUFFER_SIZE; goto cleanup; } @@ -2189,10 +2189,12 @@ OvsPortFillInfo(POVS_USER_PARAMS_CONTEXT usrParamsCtx, goto cleanup; } - rc = NlMsgPutTailU32(nlBuf, OVS_VPORT_ATTR_PORT_NO, eventEntry->portNo) || - NlMsgPutTailU32(nlBuf, OVS_VPORT_ATTR_TYPE, vport->ovsType) || + ok = NlMsgPutTailU32(nlBuf, OVS_VPORT_ATTR_PORT_NO, eventEntry->portNo) && + NlMsgPutTailU32(nlBuf, OVS_VPORT_ATTR_TYPE, vport->ovsType) && + NlMsgPutTailU32(nlBuf, OVS_VPORT_ATTR_UPCALL_PID, + vport->upcallPid) && NlMsgPutTailString(nlBuf, OVS_VPORT_ATTR_NAME, vport->ovsName); - if (!rc) { + if (!ok) { status = STATUS_INVALID_BUFFER_SIZE; goto cleanup; } -- 1.9.4.msysgit.2 _______________________________________________ dev mailing list dev@openvswitch.org https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailman_listinfo_dev&d=AAIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=RDZsrBxhAiOewDSD-jiF-W03FqHevF2o7haW6eQzmtA&m=dkKwItuB2Ay3fceyNUkt3L-2dIldAa9mQ9HsCSILFgU&s=En8PpzE3bAJ_hWTsVHwej3-hD7uOrXqym-ZMFRRjLlc&e= _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev