X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fodp-util.c;h=d5523163efec7da173209d24ad2092eec2e99c23;hb=df89525eb0b20233cdc8a58e6a43bf9b8bfd84c5;hp=60807ba0a42edcd4cb99f4f3fd93ea2b03d56658;hpb=feebdea2e5550a71c7accda936b6a55962f60a04;p=sliver-openvswitch.git diff --git a/lib/odp-util.c b/lib/odp-util.c index 60807ba0a..d5523163e 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -14,10 +14,12 @@ * limitations under the License. */ +#include #include #include "odp-util.h" #include #include +#include #include #include #include "byte-order.h" @@ -25,6 +27,7 @@ #include "dynamic-string.h" #include "flow.h" #include "netlink.h" +#include "ofpbuf.h" #include "openvswitch/tunnel.h" #include "packets.h" #include "timeval.h" @@ -33,29 +36,28 @@ int odp_action_len(uint16_t type) { - if (type > ODPAT_MAX) { + if (type > ODP_ACTION_ATTR_MAX) { return -1; } switch ((enum odp_action_type) type) { - case ODPAT_OUTPUT: return 4; - case ODPAT_CONTROLLER: return 8; - case ODPAT_SET_DL_TCI: return 2; - case ODPAT_STRIP_VLAN: return 0; - case ODPAT_SET_DL_SRC: return ETH_ADDR_LEN; - case ODPAT_SET_DL_DST: return ETH_ADDR_LEN; - case ODPAT_SET_NW_SRC: return 4; - case ODPAT_SET_NW_DST: return 4; - case ODPAT_SET_NW_TOS: return 1; - case ODPAT_SET_TP_SRC: return 2; - case ODPAT_SET_TP_DST: return 2; - case ODPAT_SET_TUNNEL: return 8; - case ODPAT_SET_PRIORITY: return 4; - case ODPAT_POP_PRIORITY: return 0; - case ODPAT_DROP_SPOOFED_ARP: return 0; - - case ODPAT_UNSPEC: - case __ODPAT_MAX: + case ODP_ACTION_ATTR_OUTPUT: return 4; + case ODP_ACTION_ATTR_USERSPACE: return 8; + case ODP_ACTION_ATTR_SET_DL_TCI: return 2; + case ODP_ACTION_ATTR_STRIP_VLAN: return 0; + case ODP_ACTION_ATTR_SET_DL_SRC: return ETH_ADDR_LEN; + case ODP_ACTION_ATTR_SET_DL_DST: return ETH_ADDR_LEN; + case ODP_ACTION_ATTR_SET_NW_SRC: return 4; + case ODP_ACTION_ATTR_SET_NW_DST: return 4; + case ODP_ACTION_ATTR_SET_NW_TOS: return 1; + case ODP_ACTION_ATTR_SET_TP_SRC: return 2; + case ODP_ACTION_ATTR_SET_TP_DST: return 2; + case ODP_ACTION_ATTR_SET_TUNNEL: return 8; + case ODP_ACTION_ATTR_SET_PRIORITY: return 4; + case ODP_ACTION_ATTR_POP_PRIORITY: return 0; + + case ODP_ACTION_ATTR_UNSPEC: + case __ODP_ACTION_ATTR_MAX: return -1; } @@ -95,58 +97,55 @@ format_odp_action(struct ds *ds, const struct nlattr *a) } switch (nl_attr_type(a)) { - case ODPAT_OUTPUT: + case ODP_ACTION_ATTR_OUTPUT: ds_put_format(ds, "%"PRIu16, nl_attr_get_u32(a)); break; - case ODPAT_CONTROLLER: - ds_put_format(ds, "ctl(%"PRIu64")", nl_attr_get_u64(a)); + case ODP_ACTION_ATTR_USERSPACE: + ds_put_format(ds, "userspace(%"PRIu64")", nl_attr_get_u64(a)); break; - case ODPAT_SET_TUNNEL: + case ODP_ACTION_ATTR_SET_TUNNEL: ds_put_format(ds, "set_tunnel(%#"PRIx64")", ntohll(nl_attr_get_be64(a))); break; - case ODPAT_SET_DL_TCI: + case ODP_ACTION_ATTR_SET_DL_TCI: ds_put_format(ds, "set_tci(vid=%"PRIu16",pcp=%d)", vlan_tci_to_vid(nl_attr_get_be16(a)), vlan_tci_to_pcp(nl_attr_get_be16(a))); break; - case ODPAT_STRIP_VLAN: + case ODP_ACTION_ATTR_STRIP_VLAN: ds_put_format(ds, "strip_vlan"); break; - case ODPAT_SET_DL_SRC: + case ODP_ACTION_ATTR_SET_DL_SRC: eth = nl_attr_get_unspec(a, ETH_ADDR_LEN); ds_put_format(ds, "set_dl_src("ETH_ADDR_FMT")", ETH_ADDR_ARGS(eth)); break; - case ODPAT_SET_DL_DST: + case ODP_ACTION_ATTR_SET_DL_DST: eth = nl_attr_get_unspec(a, ETH_ADDR_LEN); ds_put_format(ds, "set_dl_dst("ETH_ADDR_FMT")", ETH_ADDR_ARGS(eth)); break; - case ODPAT_SET_NW_SRC: + case ODP_ACTION_ATTR_SET_NW_SRC: ip = nl_attr_get_be32(a); ds_put_format(ds, "set_nw_src("IP_FMT")", IP_ARGS(&ip)); break; - case ODPAT_SET_NW_DST: + case ODP_ACTION_ATTR_SET_NW_DST: ip = nl_attr_get_be32(a); ds_put_format(ds, "set_nw_dst("IP_FMT")", IP_ARGS(&ip)); break; - case ODPAT_SET_NW_TOS: + case ODP_ACTION_ATTR_SET_NW_TOS: ds_put_format(ds, "set_nw_tos(%"PRIu8")", nl_attr_get_u8(a)); break; - case ODPAT_SET_TP_SRC: + case ODP_ACTION_ATTR_SET_TP_SRC: ds_put_format(ds, "set_tp_src(%"PRIu16")", ntohs(nl_attr_get_be16(a))); break; - case ODPAT_SET_TP_DST: + case ODP_ACTION_ATTR_SET_TP_DST: ds_put_format(ds, "set_tp_dst(%"PRIu16")", ntohs(nl_attr_get_be16(a))); break; - case ODPAT_SET_PRIORITY: + case ODP_ACTION_ATTR_SET_PRIORITY: ds_put_format(ds, "set_priority(%#"PRIx32")", nl_attr_get_u32(a)); break; - case ODPAT_POP_PRIORITY: + case ODP_ACTION_ATTR_POP_PRIORITY: ds_put_cstr(ds, "pop_priority"); break; - case ODPAT_DROP_SPOOFED_ARP: - ds_put_cstr(ds, "drop_spoofed_arp"); - break; default: format_generic_odp_action(ds, a); break; @@ -177,20 +176,6 @@ format_odp_actions(struct ds *ds, const struct nlattr *actions, ds_put_cstr(ds, "drop"); } } - -void -format_odp_flow_stats(struct ds *ds, const struct odp_flow_stats *s) -{ - ds_put_format(ds, "packets:%llu, bytes:%llu, used:", - (unsigned long long int) s->n_packets, - (unsigned long long int) s->n_bytes); - if (s->used_sec) { - long long int used = s->used_sec * 1000 + s->used_nsec / 1000000; - ds_put_format(ds, "%.3fs", (time_msec() - used) / 1000.0); - } else { - ds_put_format(ds, "never"); - } -} /* Returns the correct length of the payload for a flow key attribute of the * specified 'type', or -1 if 'type' is unknown. */ @@ -208,10 +193,13 @@ odp_flow_key_attr_len(uint16_t type) case ODP_KEY_ATTR_8021Q: return sizeof(struct odp_key_8021q); case ODP_KEY_ATTR_ETHERTYPE: return 2; case ODP_KEY_ATTR_IPV4: return sizeof(struct odp_key_ipv4); + case ODP_KEY_ATTR_IPV6: return sizeof(struct odp_key_ipv6); case ODP_KEY_ATTR_TCP: return sizeof(struct odp_key_tcp); case ODP_KEY_ATTR_UDP: return sizeof(struct odp_key_udp); case ODP_KEY_ATTR_ICMP: return sizeof(struct odp_key_icmp); + case ODP_KEY_ATTR_ICMPV6: return sizeof(struct odp_key_icmpv6); case ODP_KEY_ATTR_ARP: return sizeof(struct odp_key_arp); + case ODP_KEY_ATTR_ND: return sizeof(struct odp_key_nd); case ODP_KEY_ATTR_UNSPEC: case __ODP_KEY_ATTR_MAX: @@ -247,10 +235,13 @@ format_odp_key_attr(const struct nlattr *a, struct ds *ds) const struct odp_key_ethernet *eth_key; const struct odp_key_8021q *q_key; const struct odp_key_ipv4 *ipv4_key; + const struct odp_key_ipv6 *ipv6_key; const struct odp_key_tcp *tcp_key; const struct odp_key_udp *udp_key; const struct odp_key_icmp *icmp_key; + const struct odp_key_icmpv6 *icmpv6_key; const struct odp_key_arp *arp_key; + const struct odp_key_nd *nd_key; if (nl_attr_get_size(a) != odp_flow_key_attr_len(nl_attr_type(a))) { ds_put_format(ds, "bad length %zu, expected %d for: ", @@ -262,7 +253,7 @@ format_odp_key_attr(const struct nlattr *a, struct ds *ds) switch (nl_attr_type(a)) { case ODP_KEY_ATTR_TUN_ID: - ds_put_format(ds, "tun_id(%#"PRIx64")", nl_attr_get_be64(a)); + ds_put_format(ds, "tun_id(%#"PRIx64")", ntohll(nl_attr_get_be64(a))); break; case ODP_KEY_ATTR_IN_PORT: @@ -280,15 +271,15 @@ format_odp_key_attr(const struct nlattr *a, struct ds *ds) q_key = nl_attr_get(a); ds_put_cstr(ds, "vlan("); if (q_key->q_tpid != htons(ETH_TYPE_VLAN)) { - ds_put_format(ds, "tpid=%#"PRIx16",", ntohs(q_key->q_tpid)); + ds_put_format(ds, "tpid=0x%04"PRIx16",", ntohs(q_key->q_tpid)); } - ds_put_format(ds, "vid%"PRIu16",pcp%d)", + ds_put_format(ds, "vid=%"PRIu16",pcp=%d)", vlan_tci_to_vid(q_key->q_tci), vlan_tci_to_pcp(q_key->q_tci)); break; case ODP_KEY_ATTR_ETHERTYPE: - ds_put_format(ds, "eth_type(%#04"PRIx16")", + ds_put_format(ds, "eth_type(0x%04"PRIx16")", ntohs(nl_attr_get_be16(a))); break; @@ -301,6 +292,20 @@ format_odp_key_attr(const struct nlattr *a, struct ds *ds) ipv4_key->ipv4_proto, ipv4_key->ipv4_tos); break; + case ODP_KEY_ATTR_IPV6: { + char src_str[INET6_ADDRSTRLEN]; + char dst_str[INET6_ADDRSTRLEN]; + + ipv6_key = nl_attr_get(a); + inet_ntop(AF_INET6, ipv6_key->ipv6_src, src_str, sizeof src_str); + inet_ntop(AF_INET6, ipv6_key->ipv6_dst, dst_str, sizeof dst_str); + + ds_put_format(ds, "ipv6(src=%s,dst=%s,proto=%"PRId8",tos=%"PRIu8")", + src_str, dst_str, ipv6_key->ipv6_proto, + ipv6_key->ipv6_tos); + break; + } + case ODP_KEY_ATTR_TCP: tcp_key = nl_attr_get(a); ds_put_format(ds, "tcp(src=%"PRIu16",dst=%"PRIu16")", @@ -319,13 +324,40 @@ format_odp_key_attr(const struct nlattr *a, struct ds *ds) icmp_key->icmp_type, icmp_key->icmp_code); break; + case ODP_KEY_ATTR_ICMPV6: + icmpv6_key = nl_attr_get(a); + ds_put_format(ds, "icmpv6(type=%"PRIu8",code=%"PRIu8")", + icmpv6_key->icmpv6_type, icmpv6_key->icmpv6_code); + break; + case ODP_KEY_ATTR_ARP: arp_key = nl_attr_get(a); - ds_put_format(ds, "arp(sip="IP_FMT",tip="IP_FMT",op=%"PRIu16")", + ds_put_format(ds, "arp(sip="IP_FMT",tip="IP_FMT",op=%"PRIu16"," + "sha="ETH_ADDR_FMT",tha="ETH_ADDR_FMT")", IP_ARGS(&arp_key->arp_sip), IP_ARGS(&arp_key->arp_tip), - ntohs(arp_key->arp_op)); + ntohs(arp_key->arp_op), ETH_ADDR_ARGS(arp_key->arp_sha), + ETH_ADDR_ARGS(arp_key->arp_tha)); break; + case ODP_KEY_ATTR_ND: { + char target[INET6_ADDRSTRLEN]; + + nd_key = nl_attr_get(a); + inet_ntop(AF_INET6, nd_key->nd_target, target, sizeof target); + + ds_put_format(ds, "nd(target=%s", target); + if (!eth_addr_is_zero(nd_key->nd_sll)) { + ds_put_format(ds, ",sll="ETH_ADDR_FMT, + ETH_ADDR_ARGS(nd_key->nd_sll)); + } + if (!eth_addr_is_zero(nd_key->nd_tll)) { + ds_put_format(ds, ",tll="ETH_ADDR_FMT, + ETH_ADDR_ARGS(nd_key->nd_tll)); + } + ds_put_char(ds, ')'); + break; + } + default: format_generic_odp_key(a, ds); break; @@ -358,6 +390,312 @@ odp_flow_key_format(const struct nlattr *key, size_t key_len, struct ds *ds) } } +static int +put_nd_key(int n, const char *nd_target_s, + const uint8_t *nd_sll, const uint8_t *nd_tll, struct ofpbuf *key) +{ + struct odp_key_nd nd_key; + + memset(&nd_key, 0, sizeof nd_key); + if (inet_pton(AF_INET6, nd_target_s, nd_key.nd_target) != 1) { + return -EINVAL; + } + if (nd_sll) { + memcpy(nd_key.nd_sll, nd_sll, ETH_ADDR_LEN); + } + if (nd_tll) { + memcpy(nd_key.nd_tll, nd_tll, ETH_ADDR_LEN); + } + nl_msg_put_unspec(key, ODP_KEY_ATTR_ND, &nd_key, sizeof nd_key); + return n; +} + +static int +parse_odp_key_attr(const char *s, struct ofpbuf *key) +{ + /* Many of the sscanf calls in this function use oversized destination + * fields because some sscanf() implementations truncate the range of %i + * directives, so that e.g. "%"SCNi16 interprets input of "0xfedc" as a + * value of 0x7fff. The other alternatives are to allow only a single + * radix (e.g. decimal or hexadecimal) or to write more sophisticated + * parsers. + * + * The tun_id parser has to use an alternative approach because there is no + * type larger than 64 bits. */ + + { + char tun_id_s[32]; + int n = -1; + + if (sscanf(s, "tun_id(%31[x0123456789abcdefABCDEF])%n", + tun_id_s, &n) > 0 && n > 0) { + uint64_t tun_id = strtoull(tun_id_s, NULL, 0); + nl_msg_put_be64(key, ODP_KEY_ATTR_TUN_ID, htonll(tun_id)); + return n; + } + } + + { + unsigned long long int in_port; + int n = -1; + + if (sscanf(s, "in_port(%lli)%n", &in_port, &n) > 0 && n > 0) { + nl_msg_put_u32(key, ODP_KEY_ATTR_IN_PORT, in_port); + return n; + } + } + + { + struct odp_key_ethernet eth_key; + int n = -1; + + if (sscanf(s, + "eth(src="ETH_ADDR_SCAN_FMT",dst="ETH_ADDR_SCAN_FMT")%n", + ETH_ADDR_SCAN_ARGS(eth_key.eth_src), + ETH_ADDR_SCAN_ARGS(eth_key.eth_dst), &n) > 0 && n > 0) { + nl_msg_put_unspec(key, ODP_KEY_ATTR_ETHERNET, + ð_key, sizeof eth_key); + return n; + } + } + + { + uint16_t tpid = ETH_TYPE_VLAN; + uint16_t vid; + int pcp; + int n = -1; + + if ((sscanf(s, "vlan(vid=%"SCNi16",pcp=%i)%n", + &vid, &pcp, &n) > 0 && n > 0) || + (sscanf(s, "vlan(tpid=%"SCNi16",vid=%"SCNi16",pcp=%i)%n", + &tpid, &vid, &pcp, &n) > 0 && n > 0)) { + struct odp_key_8021q q_key; + + q_key.q_tpid = htons(tpid); + q_key.q_tci = htons((vid << VLAN_VID_SHIFT) | + (pcp << VLAN_PCP_SHIFT)); + nl_msg_put_unspec(key, ODP_KEY_ATTR_8021Q, &q_key, sizeof q_key); + return n; + } + } + + { + uint16_t eth_type; + int n = -1; + + if (sscanf(s, "eth_type(%"SCNi16")%n", ð_type, &n) > 0 && n > 0) { + nl_msg_put_be16(key, ODP_KEY_ATTR_ETHERTYPE, htons(eth_type)); + return n; + } + } + + { + ovs_be32 ipv4_src; + ovs_be32 ipv4_dst; + int ipv4_proto; + int ipv4_tos; + int n = -1; + + if (sscanf(s, "ipv4(src="IP_SCAN_FMT",dst="IP_SCAN_FMT"," + "proto=%i,tos=%i)%n", + IP_SCAN_ARGS(&ipv4_src), + IP_SCAN_ARGS(&ipv4_dst), &ipv4_proto, &ipv4_tos, &n) > 0 + && n > 0) { + struct odp_key_ipv4 ipv4_key; + + memset(&ipv4_key, 0, sizeof ipv4_key); + ipv4_key.ipv4_src = ipv4_src; + ipv4_key.ipv4_dst = ipv4_dst; + ipv4_key.ipv4_proto = ipv4_proto; + ipv4_key.ipv4_tos = ipv4_tos; + nl_msg_put_unspec(key, ODP_KEY_ATTR_IPV4, + &ipv4_key, sizeof ipv4_key); + return n; + } + } + + { + char ipv6_src_s[IPV6_SCAN_LEN + 1]; + char ipv6_dst_s[IPV6_SCAN_LEN + 1]; + int ipv6_proto; + int ipv6_tos; + int n = -1; + + if (sscanf(s, "ipv6(src="IPV6_SCAN_FMT",dst="IPV6_SCAN_FMT"," + "proto=%i,tos=%i)%n", + ipv6_src_s, ipv6_dst_s, + &ipv6_proto, &ipv6_tos, &n) > 0 && n > 0) { + struct odp_key_ipv6 ipv6_key; + + memset(&ipv6_key, 0, sizeof ipv6_key); + if (inet_pton(AF_INET6, ipv6_src_s, &ipv6_key.ipv6_src) != 1 || + inet_pton(AF_INET6, ipv6_dst_s, &ipv6_key.ipv6_dst) != 1) { + return -EINVAL; + } + ipv6_key.ipv6_proto = ipv6_proto; + ipv6_key.ipv6_tos = ipv6_tos; + nl_msg_put_unspec(key, ODP_KEY_ATTR_IPV6, + &ipv6_key, sizeof ipv6_key); + return n; + } + } + + { + int tcp_src; + int tcp_dst; + int n = -1; + + if (sscanf(s, "tcp(src=%i,dst=%i)%n",&tcp_src, &tcp_dst, &n) > 0 + && n > 0) { + struct odp_key_tcp tcp_key; + + tcp_key.tcp_src = htons(tcp_src); + tcp_key.tcp_dst = htons(tcp_dst); + nl_msg_put_unspec(key, ODP_KEY_ATTR_TCP, &tcp_key, sizeof tcp_key); + return n; + } + } + + { + int udp_src; + int udp_dst; + int n = -1; + + if (sscanf(s, "udp(src=%i,dst=%i)%n", &udp_src, &udp_dst, &n) > 0 + && n > 0) { + struct odp_key_udp udp_key; + + udp_key.udp_src = htons(udp_src); + udp_key.udp_dst = htons(udp_dst); + nl_msg_put_unspec(key, ODP_KEY_ATTR_UDP, &udp_key, sizeof udp_key); + return n; + } + } + + { + int icmp_type; + int icmp_code; + int n = -1; + + if (sscanf(s, "icmp(type=%i,code=%i)%n", + &icmp_type, &icmp_code, &n) > 0 + && n > 0) { + struct odp_key_icmp icmp_key; + + icmp_key.icmp_type = icmp_type; + icmp_key.icmp_code = icmp_code; + nl_msg_put_unspec(key, ODP_KEY_ATTR_ICMP, + &icmp_key, sizeof icmp_key); + return n; + } + } + + { + struct odp_key_icmpv6 icmpv6_key; + int n = -1; + + if (sscanf(s, "icmpv6(type=%"SCNi8",code=%"SCNi8")%n", + &icmpv6_key.icmpv6_type, &icmpv6_key.icmpv6_code,&n) > 0 + && n > 0) { + nl_msg_put_unspec(key, ODP_KEY_ATTR_ICMPV6, + &icmpv6_key, sizeof icmpv6_key); + return n; + } + } + + { + ovs_be32 arp_sip; + ovs_be32 arp_tip; + int arp_op; + uint8_t arp_sha[ETH_ADDR_LEN]; + uint8_t arp_tha[ETH_ADDR_LEN]; + int n = -1; + + if (sscanf(s, "arp(sip="IP_SCAN_FMT",tip="IP_SCAN_FMT"," + "op=%i,sha="ETH_ADDR_SCAN_FMT",tha="ETH_ADDR_SCAN_FMT")%n", + IP_SCAN_ARGS(&arp_sip), + IP_SCAN_ARGS(&arp_tip), + &arp_op, + ETH_ADDR_SCAN_ARGS(arp_sha), + ETH_ADDR_SCAN_ARGS(arp_tha), &n) > 0 && n > 0) { + struct odp_key_arp arp_key; + + memset(&arp_key, 0, sizeof arp_key); + arp_key.arp_sip = arp_sip; + arp_key.arp_tip = arp_tip; + arp_key.arp_op = htons(arp_op); + memcpy(arp_key.arp_sha, arp_sha, ETH_ADDR_LEN); + memcpy(arp_key.arp_tha, arp_tha, ETH_ADDR_LEN); + nl_msg_put_unspec(key, ODP_KEY_ATTR_ARP, &arp_key, sizeof arp_key); + return n; + } + } + + { + char nd_target_s[IPV6_SCAN_LEN + 1]; + uint8_t nd_sll[ETH_ADDR_LEN]; + uint8_t nd_tll[ETH_ADDR_LEN]; + int n = -1; + + if (sscanf(s, "nd(target="IPV6_SCAN_FMT")%n", + nd_target_s, &n) > 0 && n > 0) { + return put_nd_key(n, nd_target_s, NULL, NULL, key); + } + if (sscanf(s, "nd(target="IPV6_SCAN_FMT",sll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), &n) > 0 + && n > 0) { + return put_nd_key(n, nd_target_s, nd_sll, NULL, key); + } + if (sscanf(s, "nd(target="IPV6_SCAN_FMT",tll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_tll), &n) > 0 + && n > 0) { + return put_nd_key(n, nd_target_s, NULL, nd_tll, key); + } + if (sscanf(s, "nd(target="IPV6_SCAN_FMT",sll="ETH_ADDR_SCAN_FMT"," + "tll="ETH_ADDR_SCAN_FMT")%n", + nd_target_s, ETH_ADDR_SCAN_ARGS(nd_sll), + ETH_ADDR_SCAN_ARGS(nd_tll), &n) > 0 + && n > 0) { + return put_nd_key(n, nd_target_s, nd_sll, nd_tll, key); + } + } + + return -EINVAL; +} + +/* Parses the string representation of an ODP flow key, in the format output by + * odp_flow_key_format(). Returns 0 if successful, otherwise a positive errno + * value. On success, the flow key is appended to 'key' as a series of Netlink + * attributes. On failure, no data is appended to 'key'. Either way, 'key''s + * data might be reallocated. + * + * On success, the attributes appended to 'key' are individually syntactically + * valid, but they may not be valid as a sequence. 'key' might, for example, + * be missing an "in_port" key, have duplicated keys, or have keys in the wrong + * order. odp_flow_key_to_flow() will detect those errors. */ +int +odp_flow_key_from_string(const char *s, struct ofpbuf *key) +{ + const size_t old_size = key->size; + for (;;) { + int retval; + + s += strspn(s, ", \t\r\n"); + if (!*s) { + return 0; + } + + retval = parse_odp_key_attr(s, key); + if (retval < 0) { + key->size = old_size; + return -retval; + } + s += retval; + } + + return 0; +} + /* Appends a representation of 'flow' as ODP_KEY_ATTR_* attributes to 'buf'. */ void odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow) @@ -368,7 +706,8 @@ odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow) nl_msg_put_be64(buf, ODP_KEY_ATTR_TUN_ID, flow->tun_id); } - nl_msg_put_u32(buf, ODP_KEY_ATTR_IN_PORT, flow->in_port); + nl_msg_put_u32(buf, ODP_KEY_ATTR_IN_PORT, + ofp_port_to_odp_port(flow->in_port)); eth_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ETHERNET, sizeof *eth_key); @@ -395,41 +734,80 @@ odp_flow_key_from_flow(struct ofpbuf *buf, const struct flow *flow) ipv4_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_IPV4, sizeof *ipv4_key); + memset(ipv4_key, 0, sizeof *ipv4_key); ipv4_key->ipv4_src = flow->nw_src; ipv4_key->ipv4_dst = flow->nw_dst; ipv4_key->ipv4_proto = flow->nw_proto; ipv4_key->ipv4_tos = flow->nw_tos; + } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { + struct odp_key_ipv6 *ipv6_key; + + ipv6_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_IPV6, + sizeof *ipv6_key); + memset(ipv6_key, 0, sizeof *ipv6_key); + memcpy(ipv6_key->ipv6_src, &flow->ipv6_src, sizeof ipv6_key->ipv6_src); + memcpy(ipv6_key->ipv6_dst, &flow->ipv6_dst, sizeof ipv6_key->ipv6_dst); + ipv6_key->ipv6_proto = flow->nw_proto; + ipv6_key->ipv6_tos = flow->nw_tos; + } else if (flow->dl_type == htons(ETH_TYPE_ARP)) { + struct odp_key_arp *arp_key; + + arp_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ARP, + sizeof *arp_key); + memset(arp_key, 0, sizeof *arp_key); + arp_key->arp_sip = flow->nw_src; + arp_key->arp_tip = flow->nw_dst; + arp_key->arp_op = htons(flow->nw_proto); + memcpy(arp_key->arp_sha, flow->arp_sha, ETH_ADDR_LEN); + memcpy(arp_key->arp_tha, flow->arp_tha, ETH_ADDR_LEN); + } + + if (flow->dl_type == htons(ETH_TYPE_IP) + || flow->dl_type == htons(ETH_TYPE_IPV6)) { - if (flow->nw_proto == IP_TYPE_TCP) { + if (flow->nw_proto == IPPROTO_TCP) { struct odp_key_tcp *tcp_key; tcp_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_TCP, sizeof *tcp_key); tcp_key->tcp_src = flow->tp_src; tcp_key->tcp_dst = flow->tp_dst; - } else if (flow->nw_proto == IP_TYPE_UDP) { + } else if (flow->nw_proto == IPPROTO_UDP) { struct odp_key_udp *udp_key; udp_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_UDP, sizeof *udp_key); udp_key->udp_src = flow->tp_src; udp_key->udp_dst = flow->tp_dst; - } else if (flow->nw_proto == IP_TYPE_ICMP) { + } else if (flow->dl_type == htons(ETH_TYPE_IP) + && flow->nw_proto == IPPROTO_ICMP) { struct odp_key_icmp *icmp_key; icmp_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ICMP, sizeof *icmp_key); icmp_key->icmp_type = ntohs(flow->tp_src); icmp_key->icmp_code = ntohs(flow->tp_dst); + } else if (flow->dl_type == htons(ETH_TYPE_IPV6) + && flow->nw_proto == IPPROTO_ICMPV6) { + struct odp_key_icmpv6 *icmpv6_key; + + icmpv6_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ICMPV6, + sizeof *icmpv6_key); + icmpv6_key->icmpv6_type = ntohs(flow->tp_src); + icmpv6_key->icmpv6_code = ntohs(flow->tp_dst); + + if (icmpv6_key->icmpv6_type == ND_NEIGHBOR_SOLICIT + || icmpv6_key->icmpv6_type == ND_NEIGHBOR_ADVERT) { + struct odp_key_nd *nd_key; + + nd_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ND, + sizeof *nd_key); + memcpy(nd_key->nd_target, &flow->nd_target, + sizeof nd_key->nd_target); + memcpy(nd_key->nd_sll, flow->arp_sha, ETH_ADDR_LEN); + memcpy(nd_key->nd_tll, flow->arp_tha, ETH_ADDR_LEN); + } } - } else if (flow->dl_type == htons(ETH_TYPE_ARP)) { - struct odp_key_arp *arp_key; - - arp_key = nl_msg_put_unspec_uninit(buf, ODP_KEY_ATTR_ARP, - sizeof *arp_key); - arp_key->arp_sip = flow->nw_src; - arp_key->arp_tip = flow->nw_dst; - arp_key->arp_op = htons(flow->nw_proto); } } @@ -451,10 +829,13 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, const struct odp_key_ethernet *eth_key; const struct odp_key_8021q *q_key; const struct odp_key_ipv4 *ipv4_key; + const struct odp_key_ipv6 *ipv6_key; const struct odp_key_tcp *tcp_key; const struct odp_key_udp *udp_key; const struct odp_key_icmp *icmp_key; + const struct odp_key_icmpv6 *icmpv6_key; const struct odp_key_arp *arp_key; + const struct odp_key_nd *nd_key; uint16_t type = nl_attr_type(nla); int len = odp_flow_key_attr_len(type); @@ -474,7 +855,7 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, if (nl_attr_get_u32(nla) >= UINT16_MAX) { return EINVAL; } - flow->in_port = nl_attr_get_u32(nla); + flow->in_port = odp_port_to_ofp_port(nl_attr_get_u32(nla)); break; case TRANSITION(ODP_KEY_ATTR_IN_PORT, ODP_KEY_ATTR_ETHERNET): @@ -517,8 +898,23 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, } break; + case TRANSITION(ODP_KEY_ATTR_ETHERTYPE, ODP_KEY_ATTR_IPV6): + if (flow->dl_type != htons(ETH_TYPE_IPV6)) { + return EINVAL; + } + ipv6_key = nl_attr_get(nla); + memcpy(&flow->ipv6_src, ipv6_key->ipv6_src, sizeof flow->ipv6_src); + memcpy(&flow->ipv6_dst, ipv6_key->ipv6_dst, sizeof flow->ipv6_dst); + flow->nw_proto = ipv6_key->ipv6_proto; + flow->nw_tos = ipv6_key->ipv6_tos; + if (flow->nw_tos & IP_ECN_MASK) { + return EINVAL; + } + break; + case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_TCP): - if (flow->nw_proto != IP_TYPE_TCP) { + case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_TCP): + if (flow->nw_proto != IPPROTO_TCP) { return EINVAL; } tcp_key = nl_attr_get(nla); @@ -527,7 +923,8 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, break; case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_UDP): - if (flow->nw_proto != IP_TYPE_UDP) { + case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_UDP): + if (flow->nw_proto != IPPROTO_UDP) { return EINVAL; } udp_key = nl_attr_get(nla); @@ -536,7 +933,7 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, break; case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_ICMP): - if (flow->nw_proto != IP_TYPE_ICMP) { + if (flow->nw_proto != IPPROTO_ICMP) { return EINVAL; } icmp_key = nl_attr_get(nla); @@ -544,6 +941,15 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, flow->tp_dst = htons(icmp_key->icmp_code); break; + case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_ICMPV6): + if (flow->nw_proto != IPPROTO_ICMPV6) { + return EINVAL; + } + icmpv6_key = nl_attr_get(nla); + flow->tp_src = htons(icmpv6_key->icmpv6_type); + flow->tp_dst = htons(icmpv6_key->icmpv6_code); + break; + case TRANSITION(ODP_KEY_ATTR_ETHERTYPE, ODP_KEY_ATTR_ARP): if (flow->dl_type != htons(ETH_TYPE_ARP)) { return EINVAL; @@ -555,6 +961,19 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, return EINVAL; } flow->nw_proto = ntohs(arp_key->arp_op); + memcpy(flow->arp_sha, arp_key->arp_sha, ETH_ADDR_LEN); + memcpy(flow->arp_tha, arp_key->arp_tha, ETH_ADDR_LEN); + break; + + case TRANSITION(ODP_KEY_ATTR_ICMPV6, ODP_KEY_ATTR_ND): + if (flow->tp_src != htons(ND_NEIGHBOR_SOLICIT) + && flow->tp_src != htons(ND_NEIGHBOR_ADVERT)) { + return EINVAL; + } + nd_key = nl_attr_get(nla); + memcpy(&flow->nd_target, nd_key->nd_target, sizeof flow->nd_target); + memcpy(flow->arp_sha, nd_key->nd_sll, ETH_ADDR_LEN); + memcpy(flow->arp_tha, nd_key->nd_tll, ETH_ADDR_LEN); break; default: @@ -585,15 +1004,31 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, case ODP_KEY_ATTR_ETHERTYPE: if (flow->dl_type == htons(ETH_TYPE_IP) + || flow->dl_type == htons(ETH_TYPE_IPV6) || flow->dl_type == htons(ETH_TYPE_ARP)) { return EINVAL; } return 0; case ODP_KEY_ATTR_IPV4: - if (flow->nw_proto == IP_TYPE_TCP - || flow->nw_proto == IP_TYPE_UDP - || flow->nw_proto == IP_TYPE_ICMP) { + if (flow->nw_proto == IPPROTO_TCP + || flow->nw_proto == IPPROTO_UDP + || flow->nw_proto == IPPROTO_ICMP) { + return EINVAL; + } + return 0; + + case ODP_KEY_ATTR_IPV6: + if (flow->nw_proto == IPPROTO_TCP + || flow->nw_proto == IPPROTO_UDP + || flow->nw_proto == IPPROTO_ICMPV6) { + return EINVAL; + } + return 0; + + case ODP_KEY_ATTR_ICMPV6: + if (flow->icmp_type == htons(ND_NEIGHBOR_SOLICIT) + || flow->icmp_type == htons(ND_NEIGHBOR_ADVERT)) { return EINVAL; } return 0; @@ -602,6 +1037,7 @@ odp_flow_key_to_flow(const struct nlattr *key, size_t key_len, case ODP_KEY_ATTR_UDP: case ODP_KEY_ATTR_ICMP: case ODP_KEY_ATTR_ARP: + case ODP_KEY_ATTR_ND: return 0; case __ODP_KEY_ATTR_MAX: