projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Correct comment above ofputil_append_port_stat()
[openvswitch]
/
lib
/
packets.h
diff --git
a/lib/packets.h
b/lib/packets.h
index 4a0fcae14ce2026689e35113bae9b197aa02f312..24b51daff32260c58b561505abde5926de54a013 100644
(file)
--- a/
lib/packets.h
+++ b/
lib/packets.h
@@
-135,9
+135,7
@@
static inline void eth_addr_nicira_random(uint8_t ea[ETH_ADDR_LEN])
bool eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN]);
bool eth_addr_from_string(const char *, uint8_t ea[ETH_ADDR_LEN]);
bool eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN]);
bool eth_addr_from_string(const char *, uint8_t ea[ETH_ADDR_LEN]);
-void compose_benign_packet(struct ofpbuf *, const char *tag,
- uint16_t snap_type,
- const uint8_t eth_src[ETH_ADDR_LEN]);
+void compose_rarp(struct ofpbuf *, const uint8_t eth_src[ETH_ADDR_LEN]);
void eth_push_vlan(struct ofpbuf *, ovs_be16 tci);
void eth_pop_vlan(struct ofpbuf *);
void eth_push_vlan(struct ofpbuf *, ovs_be16 tci);
void eth_pop_vlan(struct ofpbuf *);
@@
-182,6
+180,9
@@
void eth_addr_bitand(const uint8_t src[ETH_ADDR_LEN],
#define ETH_TYPE_VLAN 0x8100
#define ETH_TYPE_IPV6 0x86dd
#define ETH_TYPE_LACP 0x8809
#define ETH_TYPE_VLAN 0x8100
#define ETH_TYPE_IPV6 0x86dd
#define ETH_TYPE_LACP 0x8809
+#define ETH_TYPE_RARP 0x8035
+#define ETH_TYPE_MPLS 0x8847
+#define ETH_TYPE_MPLS_MCAST 0x8848
/* Minimum value for an Ethernet type. Values below this are IEEE 802.2 frame
* lengths. */
/* Minimum value for an Ethernet type. Values below this are IEEE 802.2 frame
* lengths. */
@@
-319,7
+320,15
@@
void ip_format_masked(ovs_be32 ip, ovs_be32 mask, struct ds *);
#define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15)
#define IP_IHL_VER(ihl, ver) (((ver) << 4) | (ihl))
#define IP_IHL(ip_ihl_ver) ((ip_ihl_ver) & 15)
#define IP_IHL_VER(ihl, ver) (((ver) << 4) | (ihl))
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+
/* TOS fields. */
/* TOS fields. */
+#define IP_ECN_NOT_ECT 0x0
+#define IP_ECN_ECT_1 0x01
+#define IP_ECN_ECT_0 0x02
+#define IP_ECN_CE 0x03
#define IP_ECN_MASK 0x03
#define IP_DSCP_MASK 0xfc
#define IP_ECN_MASK 0x03
#define IP_DSCP_MASK 0xfc
@@
-403,6
+412,7
@@
BUILD_ASSERT_DECL(TCP_HEADER_LEN == sizeof(struct tcp_header));
#define ARP_PRO_IP 0x0800
#define ARP_OP_REQUEST 1
#define ARP_OP_REPLY 2
#define ARP_PRO_IP 0x0800
#define ARP_OP_REQUEST 1
#define ARP_OP_REPLY 2
+#define ARP_OP_RARP 3
#define ARP_ETH_HEADER_LEN 28
struct arp_eth_header {
#define ARP_ETH_HEADER_LEN 28
struct arp_eth_header {