From ee913f985d470515cc018e57ea56aac3f087702f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Tue, 7 Dec 2010 09:37:29 -0800 Subject: [PATCH] netlink: Add functions for working with big-endian attribute values. These _be functions are completely equivalent to the corresponding _u functions, but the names help to make their purpose clear. Acked-by: Jesse Gross --- lib/netlink.c | 69 ++++++++++++++++++++++++++++++++++++++++++++------- lib/netlink.h | 6 +++++ 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/lib/netlink.c b/lib/netlink.c index 39d703ae..3ed2f53a 100644 --- a/lib/netlink.c +++ b/lib/netlink.c @@ -243,30 +243,54 @@ nl_msg_put_u8(struct ofpbuf *msg, uint16_t type, uint8_t value) nl_msg_put_unspec(msg, type, &value, sizeof value); } -/* Appends a Netlink attribute of the given 'type' and the given 16-bit 'value' - * to 'msg'. */ +/* Appends a Netlink attribute of the given 'type' and the given 16-bit host + * byte order 'value' to 'msg'. */ void nl_msg_put_u16(struct ofpbuf *msg, uint16_t type, uint16_t value) { nl_msg_put_unspec(msg, type, &value, sizeof value); } -/* Appends a Netlink attribute of the given 'type' and the given 32-bit 'value' - * to 'msg'. */ +/* Appends a Netlink attribute of the given 'type' and the given 32-bit host + * byte order 'value' to 'msg'. */ void nl_msg_put_u32(struct ofpbuf *msg, uint16_t type, uint32_t value) { nl_msg_put_unspec(msg, type, &value, sizeof value); } -/* Appends a Netlink attribute of the given 'type' and the given 64-bit 'value' - * to 'msg'. */ +/* Appends a Netlink attribute of the given 'type' and the given 64-bit host + * byte order 'value' to 'msg'. */ void nl_msg_put_u64(struct ofpbuf *msg, uint16_t type, uint64_t value) { nl_msg_put_unspec(msg, type, &value, sizeof value); } +/* Appends a Netlink attribute of the given 'type' and the given 16-bit network + * byte order 'value' to 'msg'. */ +void +nl_msg_put_be16(struct ofpbuf *msg, uint16_t type, ovs_be16 value) +{ + nl_msg_put_unspec(msg, type, &value, sizeof value); +} + +/* Appends a Netlink attribute of the given 'type' and the given 32-bit network + * byte order 'value' to 'msg'. */ +void +nl_msg_put_be32(struct ofpbuf *msg, uint16_t type, ovs_be32 value) +{ + nl_msg_put_unspec(msg, type, &value, sizeof value); +} + +/* Appends a Netlink attribute of the given 'type' and the given 64-bit network + * byte order 'value' to 'msg'. */ +void +nl_msg_put_be64(struct ofpbuf *msg, uint16_t type, ovs_be64 value) +{ + nl_msg_put_unspec(msg, type, &value, sizeof value); +} + /* Appends a Netlink attribute of the given 'type' and the given * null-terminated string 'value' to 'msg'. */ void @@ -379,7 +403,7 @@ nl_attr_get_u8(const struct nlattr *nla) return NL_ATTR_GET_AS(nla, uint8_t); } -/* Returns the 16-bit value in 'nla''s payload. +/* Returns the 16-bit host byte order value in 'nla''s payload. * * Asserts that 'nla''s payload is at least 2 bytes long. */ uint16_t @@ -388,7 +412,7 @@ nl_attr_get_u16(const struct nlattr *nla) return NL_ATTR_GET_AS(nla, uint16_t); } -/* Returns the 32-bit value in 'nla''s payload. +/* Returns the 32-bit host byte order value in 'nla''s payload. * * Asserts that 'nla''s payload is at least 4 bytes long. */ uint32_t @@ -397,7 +421,7 @@ nl_attr_get_u32(const struct nlattr *nla) return NL_ATTR_GET_AS(nla, uint32_t); } -/* Returns the 64-bit value in 'nla''s payload. +/* Returns the 64-bit host byte order value in 'nla''s payload. * * Asserts that 'nla''s payload is at least 8 bytes long. */ uint64_t @@ -406,6 +430,33 @@ nl_attr_get_u64(const struct nlattr *nla) return NL_ATTR_GET_AS(nla, uint64_t); } +/* Returns the 16-bit network byte order value in 'nla''s payload. + * + * Asserts that 'nla''s payload is at least 2 bytes long. */ +ovs_be16 +nl_attr_get_be16(const struct nlattr *nla) +{ + return NL_ATTR_GET_AS(nla, ovs_be16); +} + +/* Returns the 32-bit network byte order value in 'nla''s payload. + * + * Asserts that 'nla''s payload is at least 4 bytes long. */ +ovs_be32 +nl_attr_get_be32(const struct nlattr *nla) +{ + return NL_ATTR_GET_AS(nla, ovs_be32); +} + +/* Returns the 64-bit network byte order value in 'nla''s payload. + * + * Asserts that 'nla''s payload is at least 8 bytes long. */ +ovs_be64 +nl_attr_get_be64(const struct nlattr *nla) +{ + return NL_ATTR_GET_AS(nla, ovs_be64); +} + /* Returns the null-terminated string value in 'nla''s payload. * * Asserts that 'nla''s payload contains a null-terminated string. */ diff --git a/lib/netlink.h b/lib/netlink.h index 127a41b7..3d5a849f 100644 --- a/lib/netlink.h +++ b/lib/netlink.h @@ -61,6 +61,9 @@ void nl_msg_put_u8(struct ofpbuf *, uint16_t type, uint8_t value); void nl_msg_put_u16(struct ofpbuf *, uint16_t type, uint16_t value); void nl_msg_put_u32(struct ofpbuf *, uint16_t type, uint32_t value); void nl_msg_put_u64(struct ofpbuf *, uint16_t type, uint64_t value); +void nl_msg_put_be16(struct ofpbuf *, uint16_t type, ovs_be16 value); +void nl_msg_put_be32(struct ofpbuf *, uint16_t type, ovs_be32 value); +void nl_msg_put_be64(struct ofpbuf *, uint16_t type, ovs_be64 value); void nl_msg_put_string(struct ofpbuf *, uint16_t type, const char *value); size_t nl_msg_start_nested(struct ofpbuf *, uint16_t type); @@ -95,6 +98,9 @@ uint8_t nl_attr_get_u8(const struct nlattr *); uint16_t nl_attr_get_u16(const struct nlattr *); uint32_t nl_attr_get_u32(const struct nlattr *); uint64_t nl_attr_get_u64(const struct nlattr *); +ovs_be16 nl_attr_get_be16(const struct nlattr *); +ovs_be32 nl_attr_get_be32(const struct nlattr *); +ovs_be64 nl_attr_get_be64(const struct nlattr *); const char *nl_attr_get_string(const struct nlattr *); void nl_attr_get_nested(const struct nlattr *, struct ofpbuf *); -- 2.30.2