Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VOM: mroutes
[vpp.git]
/
extras
/
vom
/
vom
/
types.hpp
diff --git
a/extras/vom/vom/types.hpp
b/extras/vom/vom/types.hpp
index
53654c5
..
383735b
100644
(file)
--- a/
extras/vom/vom/types.hpp
+++ b/
extras/vom/vom/types.hpp
@@
-53,20
+53,19
@@
enum class dependency_t
INTERFACE,
/**
INTERFACE,
/**
- * bond group binding is after interfaces but before
- * anything else
+ * virtual interfaces - those that depend on some real interface
*/
*/
-
BOND_BINDING
,
+
VIRTUAL_INTERFACE
,
/**
/**
- * T
unnel or virtual interfaces next
+ * T
ables in which entries are added, e.g bridge/route-domains
*/
*/
- T
UNNEL
,
+ T
ABLE
,
/**
/**
- *
Tables in which entries are added, e.g bridge/route-domains
+ *
virtual tables - tables with a dependency on another table
*/
*/
- TABLE,
+
VIRTUAL_
TABLE,
/**
* ACLs
/**
* ACLs
@@
-89,8
+88,6
@@
enum class dependency_t
*/
struct rc_t : public enum_base<rc_t>
{
*/
struct rc_t : public enum_base<rc_t>
{
- rc_t(const rc_t& rc) = default;
-
/**
* Destructor
*/
/**
* Destructor
*/
@@
-297,7
+294,7
@@
std::ostream& operator<<(std::ostream& os, const handle_t& h);
*/
struct mac_address_t
{
*/
struct mac_address_t
{
- mac_address_t(uint8_t bytes[6]);
+ mac_address_t(
const
uint8_t bytes[6]);
mac_address_t(const std::string& str);
mac_address_t(std::initializer_list<uint8_t> bytes);
/**
mac_address_t(const std::string& str);
mac_address_t(std::initializer_list<uint8_t> bytes);
/**
@@
-386,6
+383,22
@@
struct l2_address_t
std::vector<uint8_t> bytes;
};
std::vector<uint8_t> bytes;
};
+struct counter_t
+{
+ counter_t()
+ : packets(0)
+ , bytes(0)
+ {
+ }
+ counter_t(const counter_t& c)
+ : packets(c.packets)
+ , bytes(c.bytes)
+ {
+ }
+ uint64_t packets;
+ uint64_t bytes;
+};
+
/**
* Ostream operator for a MAC address
*/
/**
* Ostream operator for a MAC address
*/
@@
-395,6
+408,11
@@
std::ostream& operator<<(std::ostream& os, const mac_address_t& mac);
* Ostream operator for a MAC address
*/
std::ostream& operator<<(std::ostream& os, const l2_address_t& l2);
* Ostream operator for a MAC address
*/
std::ostream& operator<<(std::ostream& os, const l2_address_t& l2);
+
+/**
+ * Ostream operator for a MAC address
+ */
+std::ostream& operator<<(std::ostream& os, const counter_t& c);
};
/*
};
/*