X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fodp-util.c;h=b5e782675d2e4ed0fed9d640bfb1158805fcf1d0;hb=HEAD;hp=f16e113af6d0f86da77e41bbf69293bc9a196fc6;hpb=9d4e54c6ff743941bd0b6abc19e55b065c4a4186;p=cascardo%2Fovs.git diff --git a/lib/odp-util.c b/lib/odp-util.c index f16e113af..b5e782675 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -386,13 +386,13 @@ static void format_mpls(struct ds *ds, const struct ovs_key_mpls *mpls_key, const struct ovs_key_mpls *mpls_mask, int n) { - if (n == 1) { - ovs_be32 key = mpls_key->mpls_lse; + for (int i = 0; i < n; i++) { + ovs_be32 key = mpls_key[i].mpls_lse; if (mpls_mask == NULL) { format_mpls_lse(ds, key); } else { - ovs_be32 mask = mpls_mask->mpls_lse; + ovs_be32 mask = mpls_mask[i].mpls_lse; ds_put_format(ds, "label=%"PRIu32"/0x%x,tc=%d/%x,ttl=%d/0x%x,bos=%d/%x", mpls_lse_to_label(key), mpls_lse_to_label(mask), @@ -400,19 +400,9 @@ format_mpls(struct ds *ds, const struct ovs_key_mpls *mpls_key, mpls_lse_to_ttl(key), mpls_lse_to_ttl(mask), mpls_lse_to_bos(key), mpls_lse_to_bos(mask)); } - } else { - int i; - - for (i = 0; i < n; i++) { - ds_put_format(ds, "lse%d=%#"PRIx32, - i, ntohl(mpls_key[i].mpls_lse)); - if (mpls_mask) { - ds_put_format(ds, "/%#"PRIx32, ntohl(mpls_mask[i].mpls_lse)); - } - ds_put_char(ds, ','); - } - ds_chomp(ds, ','); + ds_put_char(ds, ','); } + ds_chomp(ds, ','); } static void @@ -475,7 +465,7 @@ format_odp_tnl_push_header(struct ds *ds, struct ovs_action_push_tnl *data) IP_ARGS(get_16aligned_be32(&ip->ip_dst)), ip->ip_proto, ip->ip_tos, ip->ip_ttl, - ip->ip_frag_off); + ntohs(ip->ip_frag_off)); l4 = (ip + 1); } else { const struct ip6_hdr *ip6; @@ -1064,16 +1054,18 @@ ovs_parse_tnl_push(const char *s, struct ovs_action_push_tnl *data) if (eth->eth_type == htons(ETH_TYPE_IP)) { /* IPv4 */ + uint16_t ip_frag_off; if (!ovs_scan_len(s, &n, "ipv4(src="IP_SCAN_FMT",dst="IP_SCAN_FMT",proto=%"SCNi8 ",tos=%"SCNi8",ttl=%"SCNi8",frag=0x%"SCNx16"),", IP_SCAN_ARGS(&sip), IP_SCAN_ARGS(&dip), &ip->ip_proto, &ip->ip_tos, - &ip->ip_ttl, &ip->ip_frag_off)) { + &ip->ip_ttl, &ip_frag_off)) { return -EINVAL; } put_16aligned_be32(&ip->ip_src, sip); put_16aligned_be32(&ip->ip_dst, dip); + ip->ip_frag_off = htons(ip_frag_off); ip_len = sizeof *ip; } else { char sip6_s[IPV6_SCAN_LEN + 1]; @@ -3923,12 +3915,9 @@ geneve_to_attr(struct ofpbuf *a, const void *data_) SCAN_FIELD_NESTED__(NAME, TYPE, SCAN_AS, 0, FUNC) #define SCAN_PUT(ATTR, FUNC) \ - if (!mask || !is_all_zeros(&smask, sizeof smask)) { \ - SCAN_PUT_ATTR(key, ATTR, skey, FUNC); \ - if (mask) { \ - SCAN_PUT_ATTR(mask, ATTR, smask, FUNC); \ - } \ - } + SCAN_PUT_ATTR(key, ATTR, skey, FUNC); \ + if (mask) \ + SCAN_PUT_ATTR(mask, ATTR, smask, FUNC); \ #define SCAN_END(ATTR) \ SCAN_FINISH(); \ @@ -3936,6 +3925,51 @@ geneve_to_attr(struct ofpbuf *a, const void *data_) return s - start; \ } +#define SCAN_BEGIN_ARRAY(NAME, TYPE, CNT) \ + SCAN_IF(NAME); \ + TYPE skey[CNT], smask[CNT]; \ + memset(&skey, 0, sizeof skey); \ + memset(&smask, 0, sizeof smask); \ + int idx = 0, cnt = CNT; \ + uint64_t fields = 0; \ + do { \ + int field = 0; \ + len = 0; + +/* Scan named ('NAME') entry 'FIELD' as 'TYPE'. */ +#define SCAN_FIELD_ARRAY(NAME, TYPE, FIELD) \ + if (strncmp(s, NAME, strlen(NAME)) == 0) { \ + if (fields & (1UL << field)) { \ + fields = 0; \ + if (++idx == cnt) { \ + break; \ + } \ + } \ + s += strlen(NAME); \ + SCAN_TYPE(TYPE, &skey[idx].FIELD, mask ? &smask[idx].FIELD : NULL); \ + fields |= 1UL << field; \ + continue; \ + } \ + field++; + +#define SCAN_PUT_ATTR_ARRAY(BUF, ATTR, DATA, CNT) \ + nl_msg_put_unspec(BUF, ATTR, &(DATA), sizeof (DATA)[0] * (CNT)); \ + +#define SCAN_PUT_ARRAY(ATTR, CNT) \ + SCAN_PUT_ATTR_ARRAY(key, ATTR, skey, CNT); \ + if (mask) { \ + SCAN_PUT_ATTR_ARRAY(mask, ATTR, smask, CNT); \ + } + +#define SCAN_END_ARRAY(ATTR) \ + SCAN_FINISH(); \ + if (idx == cnt) { \ + return -EINVAL; \ + } \ + SCAN_PUT_ARRAY(ATTR, idx + 1); \ + return s - start; \ + } + #define SCAN_END_SINGLE(ATTR) \ SCAN_FINISH_SINGLE(); \ SCAN_PUT(ATTR, NULL); \ @@ -4018,12 +4052,12 @@ parse_odp_key_mask_attr(const char *s, const struct simap *port_names, SCAN_SINGLE("eth_type(", ovs_be16, be16, OVS_KEY_ATTR_ETHERTYPE); - SCAN_BEGIN("mpls(", struct ovs_key_mpls) { - SCAN_FIELD("label=", mpls_label, mpls_lse); - SCAN_FIELD("tc=", mpls_tc, mpls_lse); - SCAN_FIELD("ttl=", mpls_ttl, mpls_lse); - SCAN_FIELD("bos=", mpls_bos, mpls_lse); - } SCAN_END(OVS_KEY_ATTR_MPLS); + SCAN_BEGIN_ARRAY("mpls(", struct ovs_key_mpls, FLOW_MAX_MPLS_LABELS) { + SCAN_FIELD_ARRAY("label=", mpls_label, mpls_lse); + SCAN_FIELD_ARRAY("tc=", mpls_tc, mpls_lse); + SCAN_FIELD_ARRAY("ttl=", mpls_ttl, mpls_lse); + SCAN_FIELD_ARRAY("bos=", mpls_bos, mpls_lse); + } SCAN_END_ARRAY(OVS_KEY_ATTR_MPLS); SCAN_BEGIN("ipv4(", struct ovs_key_ipv4) { SCAN_FIELD("src=", ipv4, ipv4_src); @@ -4532,8 +4566,7 @@ uint32_t odp_flow_key_hash(const struct nlattr *key, size_t key_len) { BUILD_ASSERT_DECL(!(NLA_ALIGNTO % sizeof(uint32_t))); - return hash_words(ALIGNED_CAST(const uint32_t *, key), - key_len / sizeof(uint32_t), 0); + return hash_bytes32(ALIGNED_CAST(const uint32_t *, key), key_len, 0); } static void