[ovs-dev] [PATCH 1/4 v2] datapath-windows: event read should not fail when no events

[Eitan Eliahu]

Acked-by: Eitan Eliahu <eliahue at vmware.com>


-----Original Message-----
From: dev [mailto:dev-bounces at openvswitch.org] On Behalf Of Nithin Raju
Sent: Saturday, October 18, 2014 11:40 AM
To: dev at openvswitch.org
Subject: [ovs-dev] [PATCH 1/4 v2] datapath-windows: event read should not fail when no events

The semantics are read operation are generally to return 0 bytes and STATUS_SUCCESS when there are no events.

Also, added a fix to assign the PID to the synthetic OVS_MESSAGE formed for the command validation.

Signed-off-by: Nithin Raju <nithin at vmware.com>
Acked-by: Nithin Raju <nithin at vmware.com>
---
 datapath-windows/ovsext/Datapath.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c
index 6cb9398..0d87a6d 100644
--- a/datapath-windows/ovsext/Datapath.c
+++ b/datapath-windows/ovsext/Datapath.c
@@ -728,6 +728,7 @@ OvsDeviceControl(PDEVICE_OBJECT deviceObject,
 
         ovsMsg = &ovsMsgReadOp;
         ovsMsg->nlMsg.nlmsgType = OVS_WIN_NL_CTRL_FAMILY_ID;
+        ovsMsg->nlMsg.nlmsgPid = instance->pid;
         /* An "artificial" command so we can use NL family function table*/
         ovsMsg->genlMsg.cmd = (code == OVS_IOCTL_READ_EVENT) ?
                               OVS_CTRL_CMD_EVENT_NOTIFY :
@@ -2289,6 +2290,9 @@ OvsReadEventCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx,
     /* remove an event entry from the event queue */
     status = OvsRemoveEventEntry(usrParamsCtx->ovsInstance, &eventEntry);
     if (status != STATUS_SUCCESS) {
+        /* If there were not elements, read should return no data. */
+        status = STATUS_SUCCESS;
+        *replyLen = 0;
         goto cleanup;
     }
 
--
1.7.4.1

_______________________________________________
dev mailing list
dev at openvswitch.org
https://urldefense.proofpoint.com/v1/url?u=http://openvswitch.org/mailman/listinfo/dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=yTvML8OxA42Jb6ViHe7fUXbvPVOYDPVq87w43doxtlY%3D%0A&m=7SmQCu2qt3E4IZsrs0w1Lb7y7FZoXYq%2BW9wBO8iyX2I%3D%0A&s=6629a31e73052922a8972768754b9a9f259c15af72a762769dd98ebc3dc6e228