X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpackets.h;h=d291c14454a4b7f5a30c27805f35d2efbc2ccdd0;hb=27e26e598926b662098e2de0d4d666ca452227fe;hp=2108beff5d7f5be78867789975fdf31dea617f56;hpb=c6bcb68592b8cab528447f5ed00fcd38d0d08c39;p=sliver-openvswitch.git diff --git a/lib/packets.h b/lib/packets.h index 2108beff5..d291c1445 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -143,8 +143,6 @@ 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); @@ -183,15 +181,14 @@ ovs_be32 set_mpls_lse_values(uint8_t ttl, uint8_t tc, uint8_t bos, * uint8_t mac[ETH_ADDR_LEN]; * int a, b; * - * if (sscanf(string, "%d"ETH_ADDR_SCAN_FMT"%d", - * &a, ETH_ADDR_SCAN_ARGS(mac), &b) == 1 + ETH_ADDR_SCAN_COUNT + 1) { + * if (ovs_scan(string, "%d"ETH_ADDR_SCAN_FMT"%d", + * &a, ETH_ADDR_SCAN_ARGS(mac), &b)) { * ... * } */ #define ETH_ADDR_SCAN_FMT "%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8 #define ETH_ADDR_SCAN_ARGS(ea) \ &(ea)[0], &(ea)[1], &(ea)[2], &(ea)[3], &(ea)[4], &(ea)[5] -#define ETH_ADDR_SCAN_COUNT 6 #define ETH_TYPE_IP 0x0800 #define ETH_TYPE_ARP 0x0806 @@ -383,8 +380,7 @@ mpls_lse_to_bos(ovs_be32 mpls_lse) * ovs_be32 ip; * int a, b; * - * if (sscanf(string, "%d"IP_SCAN_FMT"%d", - * &a, IP_SCAN_ARGS(&ip), &b) == 1 + IP_SCAN_COUNT + 1) { + * if (ovs_scan(string, "%d"IP_SCAN_FMT"%d", &a, IP_SCAN_ARGS(&ip), &b)) { * ... * } */ @@ -394,7 +390,6 @@ mpls_lse_to_bos(ovs_be32 mpls_lse) &((uint8_t *) ip)[1], \ &((uint8_t *) ip)[2], \ &((uint8_t *) ip)[3] -#define IP_SCAN_COUNT 4 /* Returns true if 'netmask' is a CIDR netmask, that is, if it consists of N * high-order 1-bits and 32-N low-order 0-bits. */ @@ -446,8 +441,8 @@ struct ip_header { uint8_t ip_ttl; uint8_t ip_proto; ovs_be16 ip_csum; - ovs_be32 ip_src; - ovs_be32 ip_dst; + ovs_16aligned_be32 ip_src; + ovs_16aligned_be32 ip_dst; }; BUILD_ASSERT_DECL(IP_HEADER_LEN == sizeof(struct ip_header)); @@ -465,7 +460,7 @@ struct icmp_header { ovs_be16 empty; ovs_be16 mtu; } frag; - ovs_be32 gateway; + ovs_16aligned_be32 gateway; } icmp_fields; uint8_t icmp_data[0]; }; @@ -489,23 +484,26 @@ struct udp_header { }; BUILD_ASSERT_DECL(UDP_HEADER_LEN == sizeof(struct udp_header)); -#define TCP_FIN 0x01 -#define TCP_SYN 0x02 -#define TCP_RST 0x04 -#define TCP_PSH 0x08 -#define TCP_ACK 0x10 -#define TCP_URG 0x20 +#define TCP_FIN 0x001 +#define TCP_SYN 0x002 +#define TCP_RST 0x004 +#define TCP_PSH 0x008 +#define TCP_ACK 0x010 +#define TCP_URG 0x020 +#define TCP_ECE 0x040 +#define TCP_CWR 0x080 +#define TCP_NS 0x100 #define TCP_CTL(flags, offset) (htons((flags) | ((offset) << 12))) -#define TCP_FLAGS(tcp_ctl) (ntohs(tcp_ctl) & 0x003f) +#define TCP_FLAGS(tcp_ctl) (ntohs(tcp_ctl) & 0x0fff) #define TCP_OFFSET(tcp_ctl) (ntohs(tcp_ctl) >> 12) #define TCP_HEADER_LEN 20 struct tcp_header { ovs_be16 tcp_src; ovs_be16 tcp_dst; - ovs_be32 tcp_seq; - ovs_be32 tcp_ack; + ovs_16aligned_be32 tcp_seq; + ovs_16aligned_be32 tcp_ack; ovs_be16 tcp_ctl; ovs_be16 tcp_winsz; ovs_be16 tcp_csum; @@ -520,7 +518,6 @@ BUILD_ASSERT_DECL(TCP_HEADER_LEN == sizeof(struct tcp_header)); #define ARP_OP_RARP 3 #define ARP_ETH_HEADER_LEN 28 -OVS_PACKED( struct arp_eth_header { /* Generic members. */ ovs_be16 ar_hrd; /* Hardware type. */ @@ -531,12 +528,44 @@ struct arp_eth_header { /* Ethernet+IPv4 specific members. */ uint8_t ar_sha[ETH_ADDR_LEN]; /* Sender hardware address. */ - ovs_be32 ar_spa; /* Sender protocol address. */ + ovs_16aligned_be32 ar_spa; /* Sender protocol address. */ uint8_t ar_tha[ETH_ADDR_LEN]; /* Target hardware address. */ - ovs_be32 ar_tpa; /* Target protocol address. */ -}); + ovs_16aligned_be32 ar_tpa; /* Target protocol address. */ +}; BUILD_ASSERT_DECL(ARP_ETH_HEADER_LEN == sizeof(struct arp_eth_header)); +/* Like struct in6_addr, but whereas that struct requires 32-bit alignment on + * most implementations, this one only requires 16-bit alignment. */ +union ovs_16aligned_in6_addr { + ovs_be16 be16[8]; + ovs_16aligned_be32 be32[4]; +}; + +/* Like struct in6_hdr, but whereas that struct requires 32-bit alignment, this + * one only requires 16-bit alignment. */ +struct ovs_16aligned_ip6_hdr { + union { + struct ovs_16aligned_ip6_hdrctl { + ovs_16aligned_be32 ip6_un1_flow; + ovs_be16 ip6_un1_plen; + uint8_t ip6_un1_nxt; + uint8_t ip6_un1_hlim; + } ip6_un1; + uint8_t ip6_un2_vfc; + } ip6_ctlun; + union ovs_16aligned_in6_addr ip6_src; + union ovs_16aligned_in6_addr ip6_dst; +}; + +/* Like struct in6_frag, but whereas that struct requires 32-bit alignment, + * this one only requires 16-bit alignment. */ +struct ovs_16aligned_ip6_frag { + uint8_t ip6f_nxt; + uint8_t ip6f_reserved; + ovs_be16 ip6f_offlg; + ovs_16aligned_be32 ip6f_ident; +}; + /* The IPv6 flow label is in the lower 20 bits of the first 32-bit word. */ #define IPV6_LABEL_MASK 0x000fffff @@ -546,7 +575,7 @@ BUILD_ASSERT_DECL(ARP_ETH_HEADER_LEN == sizeof(struct arp_eth_header)); * char ipv6_s[IPV6_SCAN_LEN + 1]; * struct in6_addr ipv6; * - * if (sscanf(string, "%d"IPV6_SCAN_FMT"%d", &a, ipv6_s, &b) == 3 + * if (ovs_scan(string, "%d"IPV6_SCAN_FMT"%d", &a, ipv6_s, &b) * && inet_pton(AF_INET6, ipv6_s, &ipv6) == 1) { * ... * } @@ -612,7 +641,8 @@ 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); void packet_set_sctp_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); +uint16_t packet_get_tcp_flags(const struct ofpbuf *, const struct flow *); +void packet_format_tcp_flags(struct ds *, uint16_t); +const char *packet_tcp_flag_to_string(uint32_t flag); #endif /* packets.h */