X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpackets.h;h=b73ff63f71a4f800ce10ae7e063ad1da43d82a88;hb=8d71683b7632b5b621dd21418bf33ff90865b4e0;hp=34a8b4eafb5a828d6ea0ca4bb28086b996f458b9;hpb=12113c394a9873aa4f54da750d9fb4ff89ccb254;p=sliver-openvswitch.git diff --git a/lib/packets.h b/lib/packets.h index 34a8b4eaf..b73ff63f7 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,13 +23,13 @@ #include #include #include "compiler.h" +#include "flow.h" #include "openvswitch/types.h" #include "random.h" #include "util.h" struct ofpbuf; struct ds; -struct flow; bool dpid_from_string(const char *s, uint64_t *dpidp); @@ -64,6 +64,12 @@ static inline bool eth_addr_is_zero(const uint8_t ea[6]) { return !(ea[0] | ea[1] | ea[2] | ea[3] | ea[4] | ea[5]); } + +static inline int eth_mask_is_exact(const uint8_t ea[ETH_ADDR_LEN]) +{ + return (ea[0] & ea[1] & ea[2] & ea[3] & ea[4] & ea[5]) == 0xff; +} + static inline int eth_addr_compare_3way(const uint8_t a[ETH_ADDR_LEN], const uint8_t b[ETH_ADDR_LEN]) { @@ -74,6 +80,17 @@ static inline bool eth_addr_equals(const uint8_t a[ETH_ADDR_LEN], { return !eth_addr_compare_3way(a, b); } +static inline bool eth_addr_equal_except(const uint8_t a[ETH_ADDR_LEN], + const uint8_t b[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + return !(((a[0] ^ b[0]) & mask[0]) + || ((a[1] ^ b[1]) & mask[1]) + || ((a[2] ^ b[2]) & mask[2]) + || ((a[3] ^ b[3]) & mask[3]) + || ((a[4] ^ b[4]) & mask[4]) + || ((a[5] ^ b[5]) & mask[5])); +} static inline uint64_t eth_addr_to_uint64(const uint8_t ea[ETH_ADDR_LEN]) { return (((uint64_t) ea[0] << 40) @@ -114,28 +131,36 @@ static inline void eth_addr_nicira_random(uint8_t ea[ETH_ADDR_LEN]) /* Set the top bit to indicate random Nicira address. */ ea[3] |= 0x80; } -/* Returns true if 'ea' is a reserved multicast address, that a bridge must - * never forward, false otherwise. */ -static inline bool eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN]) -{ - return (ea[0] == 0x01 - && ea[1] == 0x80 - && ea[2] == 0xc2 - && ea[3] == 0x00 - && ea[4] == 0x00 - && (ea[5] & 0xf0) == 0x00); -} +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 *); +uint16_t eth_mpls_depth(const struct ofpbuf *packet); + +void set_ethertype(struct ofpbuf *packet, ovs_be16 eth_type); + const char *eth_from_hex(const char *hex, struct ofpbuf **packetp); +void eth_format_masked(const uint8_t eth[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN], struct ds *s); +void eth_addr_bitand(const uint8_t src[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN], + uint8_t dst[ETH_ADDR_LEN]); + +void set_mpls_lse(struct ofpbuf *, ovs_be32 label); +void push_mpls(struct ofpbuf *packet, ovs_be16 ethtype, ovs_be32 lse); +void pop_mpls(struct ofpbuf *, ovs_be16 ethtype); + +void set_mpls_lse_ttl(ovs_be32 *lse, uint8_t ttl); +void set_mpls_lse_tc(ovs_be32 *lse, uint8_t tc); +void set_mpls_lse_label(ovs_be32 *lse, ovs_be32 label); +void set_mpls_lse_bos(ovs_be32 *lse, uint8_t bos); +ovs_be32 set_mpls_lse_values(uint8_t ttl, uint8_t tc, uint8_t bos, + ovs_be32 label); /* Example: * @@ -167,9 +192,20 @@ const char *eth_from_hex(const char *hex, struct ofpbuf **packetp); #define ETH_TYPE_IP 0x0800 #define ETH_TYPE_ARP 0x0806 -#define ETH_TYPE_VLAN 0x8100 +#define ETH_TYPE_VLAN_8021Q 0x8100 +#define ETH_TYPE_VLAN ETH_TYPE_VLAN_8021Q +#define ETH_TYPE_VLAN_8021AD 0x88a8 #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 + +static inline bool eth_type_mpls(ovs_be16 eth_type) +{ + return eth_type == htons(ETH_TYPE_MPLS) || + eth_type == htons(ETH_TYPE_MPLS_MCAST); +} /* Minimum value for an Ethernet type. Values below this are IEEE 802.2 frame * lengths. */ @@ -257,16 +293,72 @@ struct vlan_eth_header { } __attribute__((packed)); BUILD_ASSERT_DECL(VLAN_ETH_HEADER_LEN == sizeof(struct vlan_eth_header)); -/* The "(void) (ip)[0]" below has no effect on the value, since it's the first - * argument of a comma expression, but it makes sure that 'ip' is a pointer. - * This is useful since a common mistake is to pass an integer instead of a - * pointer to IP_ARGS. */ -#define IP_FMT "%"PRIu8".%"PRIu8".%"PRIu8".%"PRIu8 +/* MPLS related definitions */ +#define MPLS_TTL_MASK 0x000000ff +#define MPLS_TTL_SHIFT 0 + +#define MPLS_BOS_MASK 0x00000100 +#define MPLS_BOS_SHIFT 8 + +#define MPLS_TC_MASK 0x00000e00 +#define MPLS_TC_SHIFT 9 + +#define MPLS_LABEL_MASK 0xfffff000 +#define MPLS_LABEL_SHIFT 12 + +#define MPLS_HLEN 4 + +struct mpls_hdr { + ovs_be32 mpls_lse; +}; +BUILD_ASSERT_DECL(MPLS_HLEN == sizeof(struct mpls_hdr)); + +/* Given a mpls label stack entry in network byte order + * return mpls label in host byte order */ +static inline uint32_t +mpls_lse_to_label(ovs_be32 mpls_lse) +{ + return (ntohl(mpls_lse) & MPLS_LABEL_MASK) >> MPLS_LABEL_SHIFT; +} + +/* Given a mpls label stack entry in network byte order + * return mpls tc */ +static inline uint8_t +mpls_lse_to_tc(ovs_be32 mpls_lse) +{ + return (ntohl(mpls_lse) & MPLS_TC_MASK) >> MPLS_TC_SHIFT; +} + +/* Given a mpls label stack entry in network byte order + * return mpls ttl */ +static inline uint8_t +mpls_lse_to_ttl(ovs_be32 mpls_lse) +{ + return (ntohl(mpls_lse) & MPLS_TTL_MASK) >> MPLS_TTL_SHIFT; +} + +/* Set TTL in mpls lse. */ +static inline void +flow_set_mpls_lse_ttl(ovs_be32 *mpls_lse, uint8_t ttl) +{ + *mpls_lse &= ~htonl(MPLS_TTL_MASK); + *mpls_lse |= htonl(ttl << MPLS_TTL_SHIFT); +} + +/* Given a mpls label stack entry in network byte order + * return mpls BoS bit */ +static inline uint8_t +mpls_lse_to_bos(ovs_be32 mpls_lse) +{ + return (mpls_lse & htonl(MPLS_BOS_MASK)) != 0; +} + +#define IP_FMT "%"PRIu32".%"PRIu32".%"PRIu32".%"PRIu32 #define IP_ARGS(ip) \ - ((void) (ip)[0], ((uint8_t *) ip)[0]), \ - ((uint8_t *) ip)[1], \ - ((uint8_t *) ip)[2], \ - ((uint8_t *) ip)[3] + ntohl(ip) >> 24, \ + (ntohl(ip) >> 16) & 0xff, \ + (ntohl(ip) >> 8) & 0xff, \ + ntohl(ip) & 0xff /* Example: * @@ -307,7 +399,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)) +#ifndef IPPROTO_SCTP +#define IPPROTO_SCTP 132 +#endif + /* 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 @@ -391,6 +491,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_OP_RARP 3 #define ARP_ETH_HEADER_LEN 28 struct arp_eth_header { @@ -448,6 +549,17 @@ static inline bool ipv6_mask_is_exact(const struct in6_addr *mask) { return ipv6_addr_equals(mask, &in6addr_exact); } +static inline bool dl_type_is_ip_any(ovs_be16 dl_type) +{ + return dl_type == htons(ETH_TYPE_IP) + || dl_type == htons(ETH_TYPE_IPV6); +} + +static inline bool is_ip_any(const struct flow *flow) +{ + return dl_type_is_ip_any(flow->dl_type); +} + void format_ipv6_addr(char *addr_str, const struct in6_addr *addr); void print_ipv6_addr(struct ds *string, const struct in6_addr *addr); void print_ipv6_masked(struct ds *string, const struct in6_addr *addr, @@ -466,9 +578,13 @@ void *snap_compose(struct ofpbuf *, const uint8_t eth_dst[ETH_ADDR_LEN], unsigned int oui, uint16_t snap_type, size_t size); void packet_set_ipv4(struct ofpbuf *, ovs_be32 src, ovs_be32 dst, uint8_t tos, uint8_t ttl); +void packet_set_ipv6(struct ofpbuf *, uint8_t proto, const ovs_be32 src[4], + const ovs_be32 dst[4], uint8_t tc, + ovs_be32 fl, uint8_t hlmit); void packet_set_tcp_port(struct ofpbuf *, ovs_be16 src, ovs_be16 dst); void packet_set_udp_port(struct ofpbuf *, ovs_be16 src, ovs_be16 dst); uint8_t packet_get_tcp_flags(const struct ofpbuf *, const struct flow *); +void packet_format_tcp_flags(struct ds *, uint8_t); #endif /* packets.h */