NlAttrGetBeXX should be inline. Ankur will make them inline in a successive patch so we can proceed now with the flow dump.
Acked-by: Eitan Eliahu <elia...@vmware.com> -----Original Message----- From: dev [mailto:dev-boun...@openvswitch.org] On Behalf Of Ankur Sharma Sent: Wednesday, September 24, 2014 12:16 AM To: dev@openvswitch.org Subject: [ovs-dev] [PATCH v1 03/10] datapath-windows/Netlink: Added NlAttrLen API Added an API to retrieve the attribute length. Added 2 more API for BE16 and BE8 attribute parsing. Fixed a trailing whitespace issue. --- datapath-windows/ovsext/Netlink/Netlink.c | 28 +++++++++++++++++++++++++++- datapath-windows/ovsext/Netlink/Netlink.h | 13 ++++++++++++- datapath-windows/ovsext/Types.h | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/datapath-windows/ovsext/Netlink/Netlink.c b/datapath-windows/ovsext/Netlink/Netlink.c index efaba90..5f07451 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.c +++ b/datapath-windows/ovsext/Netlink/Netlink.c @@ -585,7 +585,7 @@ NlMsgAttrs(const PNL_MSG_HDR nlh) * Returns size of to nlmsg attributes. * --------------------------------------------------------------------------- */ -INT +UINT32 NlMsgAttrLen(const PNL_MSG_HDR nlh) { return NlMsgPayloadLen(nlh) - GENL_HDRLEN - OVS_HDRLEN; @@ -788,6 +788,32 @@ NlAttrGetBe32(const PNL_ATTR nla) /* * --------------------------------------------------------------------------- + * Returns the 16-bit network byte order value in 'nla''s payload. + * + * Asserts that 'nla''s payload is at least 2 bytes long. + * +----------------------------------------------------------------------- +---- + */ +BE16 +NlAttrGetBe16(const PNL_ATTR nla) +{ + return NL_ATTR_GET_AS(nla, BE16); +} + +/* + * +----------------------------------------------------------------------- +---- + * Returns the 8-bit network byte order value in 'nla''s payload. + * + * Asserts that 'nla''s payload is at least 1 byte long. + * +----------------------------------------------------------------------- +---- + */ +BE8 +NlAttrGetBe8(const PNL_ATTR nla) +{ + return NL_ATTR_GET_AS(nla, BE8); +} + +/* + * +----------------------------------------------------------------------- +---- * Returns the 8-bit value in 'nla''s payload. * --------------------------------------------------------------------------- */ diff --git a/datapath-windows/ovsext/Netlink/Netlink.h b/datapath-windows/ovsext/Netlink/Netlink.h index 8f30800..80f98dd 100644 --- a/datapath-windows/ovsext/Netlink/Netlink.h +++ b/datapath-windows/ovsext/Netlink/Netlink.h @@ -98,7 +98,7 @@ UINT32 NlMsgSize(const PNL_MSG_HDR nlh); PCHAR NlMsgPayload(const PNL_MSG_HDR nlh); UINT32 NlMsgPayloadLen(const PNL_MSG_HDR nlh); PNL_ATTR NlMsgAttrs(const PNL_MSG_HDR nlh); -INT NlMsgAttrLen(const PNL_MSG_HDR nlh); +UINT32 NlMsgAttrLen(const PNL_MSG_HDR nlh); /* Netlink message parse */ PNL_MSG_HDR NlMsgNext(const PNL_MSG_HDR nlh); @@ -130,6 +130,17 @@ BOOLEAN NlAttrParse(const PNL_MSG_HDR nlMsg, UINT32 attrOffset, BOOLEAN NlParseNested(const PNL_ATTR, const NL_POLICY policy[], PNL_ATTR attrs[], UINT32 n_attrs); +/* + * +----------------------------------------------------------------------- +--- + * Returns the length of attribute. + * +----------------------------------------------------------------------- +--- + */ +static __inline UINT16 +NlAttrLen(const PNL_ATTR nla) +{ + return nla->nlaLen; +} + /* Netlink attribute validation */ BOOLEAN NlAttrValidate(const PNL_ATTR, const PNL_POLICY); diff --git a/datapath-windows/ovsext/Types.h b/datapath-windows/ovsext/Types.h index b2ef48c..5d2744b 100644 --- a/datapath-windows/ovsext/Types.h +++ b/datapath-windows/ovsext/Types.h @@ -31,6 +31,7 @@ typedef uint8 __u8; /* Defines the userspace specific data types for file * included within kernel only. */ +typedef UINT8 BE8; typedef UINT16 BE16; typedef UINT32 BE32; typedef UINT64 BE64; -- 1.9.1 _______________________________________________ dev mailing list dev@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=5xyOgHWwlQuLdeVhvt%2BapjrKL5c2oE41lNWJJGpjFHA%3D%0A&s=34f1602cbc9e6bc303183a7de119d4b7ec79d9fe173209000f3cd2b8c8e48167 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
