Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / lib / netlink.h

diff --git a/lib/netlink.h b/lib/netlink.h
index 383681c..b1bf585 100644 (file)
--- 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,
@@ -115,7 +118,7 @@ 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;                                                    \
@@ -154,4 +157,8 @@ 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);
+
 #endif /* netlink.h */