X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnetlink.h;h=2d3457167a819f10b5111b7769069c90cd5ab1f7;hb=320232ec7f37218a6fce0704f9b0ba7696e5ad21;hp=383681c3332e73ab6ad12a4cbb62e4e14cfe1b93;hpb=7f8ca6459c37ede8faf13f730bcd4d9f05dfd13b;p=openvswitch

diff --git a/lib/netlink.h b/lib/netlink.h
index 383681c3..2d345716 100644
--- a/lib/netlink.h
+++ b/lib/netlink.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,8 +83,11 @@ enum nl_attr_type
     NL_A_UNSPEC,
     NL_A_U8,
     NL_A_U16,
+    NL_A_BE16 = NL_A_U16,
     NL_A_U32,
+    NL_A_BE32 = NL_A_U32,
     NL_A_U64,
+    NL_A_BE64 = NL_A_U64,
     NL_A_STRING,
     NL_A_FLAG,
     NL_A_NESTED,
@@ -95,7 +98,7 @@ enum nl_attr_type
 static inline struct nlattr *
 nl_attr_next(const struct nlattr *nla)
 {
-    return (struct nlattr *) ((uint8_t *) nla + NLA_ALIGN(nla->nla_len));
+    return (void *) ((uint8_t *) nla + NLA_ALIGN(nla->nla_len));
 }
 
 static inline bool
@@ -115,12 +118,18 @@ nl_attr_is_valid(const struct nlattr *nla, size_t maxlen)
 
 /* This macro does not check for attributes with bad lengths.  It should only
  * be used with messages from trusted sources or with messages that have
- * already been validates (e.g. with NL_ATTR_FOR_EACH).  */
+ * already been validated (e.g. with NL_ATTR_FOR_EACH).  */
 #define NL_ATTR_FOR_EACH_UNSAFE(ITER, LEFT, ATTRS, ATTRS_LEN)           \
     for ((ITER) = (ATTRS), (LEFT) = (ATTRS_LEN);                        \
          (LEFT) > 0;                                                    \
          (LEFT) -= NLA_ALIGN((ITER)->nla_len), (ITER) = nl_attr_next(ITER))
 
+/* These variants are convenient for iterating nested attributes. */
+#define NL_NESTED_FOR_EACH(ITER, LEFT, A)                               \
+    NL_ATTR_FOR_EACH(ITER, LEFT, nl_attr_get(A), nl_attr_get_size(A))
+#define NL_NESTED_FOR_EACH_UNSAFE(ITER, LEFT, A)                        \
+    NL_ATTR_FOR_EACH_UNSAFE(ITER, LEFT, nl_attr_get(A), nl_attr_get_size(A))
+
 /* Netlink attribute parsing. */
 int nl_attr_type(const struct nlattr *);
 const void *nl_attr_get(const struct nlattr *);
@@ -154,4 +163,10 @@ bool nl_policy_parse(const struct ofpbuf *, size_t offset,
 bool nl_parse_nested(const struct nlattr *, const struct nl_policy[],
                      struct nlattr *[], size_t n_attrs);
 
+const struct nlattr *nl_attr_find(const struct ofpbuf *, size_t hdr_len,
+                                  uint16_t type);
+const struct nlattr *nl_attr_find_nested(const struct nlattr *, uint16_t type);
+const struct nlattr *nl_attr_find__(const struct nlattr *attrs, size_t size,
+                                    uint16_t type);
+
 #endif /* netlink.h */