* limitations under the License.
*/
+#include <arpa/inet.h>
#include <config.h>
#include "odp-util.h"
#include <errno.h>
#include <inttypes.h>
+#include <netinet/icmp6.h>
#include <stdlib.h>
#include <string.h>
#include "byte-order.h"
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_CONTROLLER: 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_DROP_SPOOFED_ARP: return 0;
+
+ case ODP_ACTION_ATTR_UNSPEC:
+ case __ODP_ACTION_ATTR_MAX:
return -1;
}
}
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:
+ case ODP_ACTION_ATTR_CONTROLLER:
ds_put_format(ds, "ctl(%"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:
+ case ODP_ACTION_ATTR_DROP_SPOOFED_ARP:
ds_put_cstr(ds, "drop_spoofed_arp");
break;
default:
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");
- }
-}
\f
/* Returns the correct length of the payload for a flow key attribute of the
* specified 'type', or -1 if 'type' is unknown. */
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:
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: ",
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:
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)",
vlan_tci_to_vid(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;
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")",
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;
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;
- if (flow->nw_proto == IP_TYPE_TCP) {
+ 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 == 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);
}
}
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);
}
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);
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);
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);
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;
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:
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;
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:
git://git.onelab.eu / sliver-openvswitch.git / blobdiff