| Message ID | 1467245333-8112-9-git-send-email-vsairam@vmware.com |
|---|---|
| State | Superseded |
| Delegated to: | Guru Shetty |
| Headers | show |
Acked-by: Nithin Raju <nithin@vmware.com> -----Original Message----- From: dev <dev-bounces@openvswitch.org> on behalf of Sairam Venugopal <vsairam@vmware.com> Date: Wednesday, June 29, 2016 at 5:08 PM To: "dev@openvswitch.org" <dev@openvswitch.org> Subject: [ovs-dev] [PATCH v4 08/11] datapath-windows: Add support for Conntrack IPCTNL_MSG_CT_GET cmd in Datapath.c >This will be used by userspace for dumping conntrack entries - "ovs-dpctl >dump-conntrack". > >Signed-off-by: Sairam Venugopal <vsairam@vmware.com> >Acked-by: Paul-Daniel Boca <pboca@cloudbasesolutions.com> >--- > datapath-windows/ovsext/Datapath.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > >diff --git a/datapath-windows/ovsext/Datapath.c >b/datapath-windows/ovsext/Datapath.c >index c9e3709..2f33420 100644 >--- a/datapath-windows/ovsext/Datapath.c >+++ b/datapath-windows/ovsext/Datapath.c >@@ -104,7 +104,8 @@ NetlinkCmdHandler OvsGetNetdevCmdHandler, > OvsPendPacketCmdHandler, > OvsSubscribePacketCmdHandler, > OvsReadPacketCmdHandler, >- OvsCtDeleteCmdHandler; >+ OvsCtDeleteCmdHandler, >+ OvsCtDumpCmdHandler; > > static NTSTATUS HandleGetDpTransaction(POVS_USER_PARAMS_CONTEXT >usrParamsCtx, > UINT32 *replyLen); >@@ -288,7 +289,12 @@ NETLINK_CMD nlCtFamilyCmdOps[] = { > { .cmd = IPCTNL_MSG_CT_DELETE, > .handler = OvsCtDeleteCmdHandler, > .supportedDevOp = OVS_TRANSACTION_DEV_OP, >- .validateDpIndex = TRUE >+ .validateDpIndex = FALSE >+ }, >+ { .cmd = IPCTNL_MSG_CT_GET, >+ .handler = OvsCtDumpCmdHandler, >+ .supportedDevOp = OVS_WRITE_DEV_OP | OVS_READ_DEV_OP, >+ .validateDpIndex = FALSE > } > }; > >@@ -904,6 +910,7 @@ OvsDeviceControl(PDEVICE_OBJECT deviceObject, > > ASSERT(ovsMsg); > switch (ovsMsg->nlMsg.nlmsgType) { >+ case NFNL_TYPE_CT_GET: > case NFNL_TYPE_CT_DEL: > nlFamilyOps = &nlCtFamilyOps; > break; >-- >2.5.0.windows.1 > >_______________________________________________ >dev mailing list >dev@openvswitch.org >https://urldefense.proofpoint.com/v2/url?u=http-3A__openvswitch.org_mailma >n_listinfo_dev&d=CwIGaQ&c=Sqcl0Ez6M0X8aeM67LKIiDJAXVeAw-YihVMNtXt-uEs&r=pN >HQcdr7B40b4h6Yb7FIedI1dnBsxdDuTLBYD3JqV80&m=beA9Tq4IJdCKdsriwThwdXvRo3wzhf >lrQ52u1agGBQM&s=cWs8Vgf9hnrDzKU2GwFwsWzdcaPXzR-GUmFhJTGU3LM&e=
diff --git a/datapath-windows/ovsext/Datapath.c b/datapath-windows/ovsext/Datapath.c index c9e3709..2f33420 100644 --- a/datapath-windows/ovsext/Datapath.c +++ b/datapath-windows/ovsext/Datapath.c @@ -104,7 +104,8 @@ NetlinkCmdHandler OvsGetNetdevCmdHandler, OvsPendPacketCmdHandler, OvsSubscribePacketCmdHandler, OvsReadPacketCmdHandler, - OvsCtDeleteCmdHandler; + OvsCtDeleteCmdHandler, + OvsCtDumpCmdHandler; static NTSTATUS HandleGetDpTransaction(POVS_USER_PARAMS_CONTEXT usrParamsCtx, UINT32 *replyLen); @@ -288,7 +289,12 @@ NETLINK_CMD nlCtFamilyCmdOps[] = { { .cmd = IPCTNL_MSG_CT_DELETE, .handler = OvsCtDeleteCmdHandler, .supportedDevOp = OVS_TRANSACTION_DEV_OP, - .validateDpIndex = TRUE + .validateDpIndex = FALSE + }, + { .cmd = IPCTNL_MSG_CT_GET, + .handler = OvsCtDumpCmdHandler, + .supportedDevOp = OVS_WRITE_DEV_OP | OVS_READ_DEV_OP, + .validateDpIndex = FALSE } }; @@ -904,6 +910,7 @@ OvsDeviceControl(PDEVICE_OBJECT deviceObject, ASSERT(ovsMsg); switch (ovsMsg->nlMsg.nlmsgType) { + case NFNL_TYPE_CT_GET: case NFNL_TYPE_CT_DEL: nlFamilyOps = &nlCtFamilyOps; break;