Acked-by: Alin Gabriel Serdean <aserd...@cloudbasesolutions.com>
> -----Mesaj original----- > De la: dev [mailto:dev-boun...@openvswitch.org] În numele Nithin Raju > Trimis: Tuesday, May 17, 2016 8:15 PM > Către: dev@openvswitch.org > Subiect: [ovs-dev] [PATCH 1/4 v2] datapath-windows: add nlMsgHdr to > OvsPacketExecute > > We'll need this for parsing nested attributes. > > Signed-off-by: Nithin Raju <nit...@vmware.com> > --- > datapath-windows/ovsext/DpInternal.h | 1 + > datapath-windows/ovsext/User.c | 13 ++++++++----- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/datapath-windows/ovsext/DpInternal.h b/datapath- > windows/ovsext/DpInternal.h > index a3ce311..07bc180 100644 > --- a/datapath-windows/ovsext/DpInternal.h > +++ b/datapath-windows/ovsext/DpInternal.h > @@ -275,6 +275,7 @@ typedef struct OvsPacketExecute { > > uint32_t packetLen; > uint32_t actionsLen; > + PNL_MSG_HDR nlMsgHdr; > PCHAR packetBuf; > PNL_ATTR actions; > PNL_ATTR *keyAttrs; > diff --git a/datapath-windows/ovsext/User.c b/datapath- > windows/ovsext/User.c index 34f38f4..3b3f662 100644 > --- a/datapath-windows/ovsext/User.c > +++ b/datapath-windows/ovsext/User.c > @@ -46,8 +46,9 @@ extern PNDIS_SPIN_LOCK gOvsCtrlLock; extern > POVS_SWITCH_CONTEXT gOvsSwitchContext; OVS_USER_STATS > ovsUserStats; > > -static VOID _MapNlAttrToOvsPktExec(PNL_ATTR *nlAttrs, PNL_ATTR > *keyAttrs, > - OvsPacketExecute *execute); > +static VOID _MapNlAttrToOvsPktExec(PNL_MSG_HDR nlMsgHdr, PNL_ATTR > *nlAttrs, > + PNL_ATTR *keyAttrs, > + OvsPacketExecute *execute); > extern NL_POLICY nlFlowKeyPolicy[]; > extern UINT32 nlFlowKeyPolicyLen; > > @@ -311,7 +312,7 @@ > OvsNlExecuteCmdHandler(POVS_USER_PARAMS_CONTEXT usrParamsCtx, > > execute.dpNo = ovsHdr->dp_ifindex; > > - _MapNlAttrToOvsPktExec(nlAttrs, keyAttrs, &execute); > + _MapNlAttrToOvsPktExec(nlMsgHdr, nlAttrs, keyAttrs, &execute); > > status = OvsExecuteDpIoctl(&execute); > > @@ -363,12 +364,14 @@ done: > > *---------------------------------------------------------------------------- > */ > static VOID > -_MapNlAttrToOvsPktExec(PNL_ATTR *nlAttrs, PNL_ATTR *keyAttrs, > - OvsPacketExecute *execute) > +_MapNlAttrToOvsPktExec(PNL_MSG_HDR nlMsgHdr, PNL_ATTR *nlAttrs, > + PNL_ATTR *keyAttrs, OvsPacketExecute *execute) > { > execute->packetBuf = NlAttrGet(nlAttrs[OVS_PACKET_ATTR_PACKET]); > execute->packetLen = > NlAttrGetSize(nlAttrs[OVS_PACKET_ATTR_PACKET]); > > + execute->nlMsgHdr = nlMsgHdr; > + > execute->actions = NlAttrGet(nlAttrs[OVS_PACKET_ATTR_ACTIONS]); > execute->actionsLen = > NlAttrGetSize(nlAttrs[OVS_PACKET_ATTR_ACTIONS]); > > -- > 2.7.1.windows.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
