X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fmultipath.c;h=0a58c062c76821162cb15ed19c2fbb612b5613a4;hb=ca7e7bee86b4ee821d61b58bf15c89a9d8a3cb30;hp=6c0560d906677fcde5c55b9957056c35a7495ec9;hpb=bdda5aca7b376bcc8c88072d00011a9da04af65c;p=cascardo%2Fovs.git

diff --git a/lib/multipath.c b/lib/multipath.c
index 6c0560d90..0a58c062c 100644
--- a/lib/multipath.c
+++ b/lib/multipath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,49 +28,7 @@
 #include "ofp-util.h"
 #include "openflow/nicira-ext.h"
 #include "packets.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(multipath);
-
-static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
 
-/* Converts 'nam' into 'mp'.  Returns 0 if successful, otherwise an
- * OFPERR_*. */
-enum ofperr
-multipath_from_openflow(const struct nx_action_multipath *nam,
-                        struct ofpact_multipath *mp)
-{
-    uint32_t n_links = ntohs(nam->max_link) + 1;
-    size_t min_n_bits = log_2_ceil(n_links);
-
-    ofpact_init_MULTIPATH(mp);
-    mp->fields = ntohs(nam->fields);
-    mp->basis = ntohs(nam->basis);
-    mp->algorithm = ntohs(nam->algorithm);
-    mp->max_link = ntohs(nam->max_link);
-    mp->arg = ntohl(nam->arg);
-    mp->dst.field = mf_from_nxm_header(ntohl(nam->dst));
-    mp->dst.ofs = nxm_decode_ofs(nam->ofs_nbits);
-    mp->dst.n_bits = nxm_decode_n_bits(nam->ofs_nbits);
-
-    if (!flow_hash_fields_valid(mp->fields)) {
-        VLOG_WARN_RL(&rl, "unsupported fields %d", (int) mp->fields);
-        return OFPERR_OFPBAC_BAD_ARGUMENT;
-    } else if (mp->algorithm != NX_MP_ALG_MODULO_N
-               && mp->algorithm != NX_MP_ALG_HASH_THRESHOLD
-               && mp->algorithm != NX_MP_ALG_HRW
-               && mp->algorithm != NX_MP_ALG_ITER_HASH) {
-        VLOG_WARN_RL(&rl, "unsupported algorithm %d", (int) mp->algorithm);
-        return OFPERR_OFPBAC_BAD_ARGUMENT;
-    } else if (mp->dst.n_bits < min_n_bits) {
-        VLOG_WARN_RL(&rl, "multipath action requires at least %zu bits for "
-                     "%"PRIu32" links", min_n_bits, n_links);
-        return OFPERR_OFPBAC_BAD_ARGUMENT;
-    }
-
-    return multipath_check(mp, NULL);
-}
-
 /* Checks that 'mp' is valid on flow.  Returns 0 if it is valid, otherwise an
  * OFPERR_*. */
 enum ofperr
@@ -79,22 +37,6 @@ multipath_check(const struct ofpact_multipath *mp,
 {
     return mf_check_dst(&mp->dst, flow);
 }
-
-/* Converts 'mp' into an OpenFlow NXAST_MULTIPATH action, which it appends to
- * 'openflow'. */
-void
-multipath_to_nxast(const struct ofpact_multipath *mp, struct ofpbuf *openflow)
-{
-    struct nx_action_multipath *nam = ofputil_put_NXAST_MULTIPATH(openflow);
-
-    nam->fields = htons(mp->fields);
-    nam->basis = htons(mp->basis);
-    nam->algorithm = htons(mp->algorithm);
-    nam->max_link = htons(mp->max_link);
-    nam->arg = htonl(mp->arg);
-    nam->ofs_nbits = nxm_encode_ofs_nbits(mp->dst.ofs, mp->dst.n_bits);
-    nam->dst = htonl(mp->dst.field->nxm_header);
-}
 
 /* multipath_execute(). */
 
@@ -114,7 +56,7 @@ multipath_execute(const struct ofpact_multipath *mp, struct flow *flow,
                                         mp->max_link + 1, mp->arg);
 
     flow_mask_hash_fields(flow, wc, mp->fields);
-    nxm_reg_load(&mp->dst, link, flow);
+    nxm_reg_load(&mp->dst, link, flow, wc);
 }
 
 static uint16_t
@@ -189,7 +131,7 @@ multipath_algorithm(uint32_t hash, enum nx_mp_algorithm algorithm,
         return algorithm_iter_hash(hash, n_links, arg);
     }
 
-    NOT_REACHED();
+    OVS_NOT_REACHED();
 }
 
 /* Parses 's_' as a set of arguments to the "multipath" action and initializes
@@ -197,7 +139,7 @@ multipath_algorithm(uint32_t hash, enum nx_mp_algorithm algorithm,
  *
  * Returns NULL if successful, otherwise a malloc()'d string describing the
  * error.  The caller is responsible for freeing the returned string.*/
-static char * WARN_UNUSED_RESULT
+static char * OVS_WARN_UNUSED_RESULT
 multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s)
 {
     char *save_ptr = NULL;
@@ -220,6 +162,10 @@ multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s)
         mp->fields = NX_HASH_FIELDS_ETH_SRC;
     } else if (!strcasecmp(fields, "symmetric_l4")) {
         mp->fields = NX_HASH_FIELDS_SYMMETRIC_L4;
+    } else if (!strcasecmp(fields, "symmetric_l3l4")) {
+        mp->fields = NX_HASH_FIELDS_SYMMETRIC_L3L4;
+    } else if (!strcasecmp(fields, "symmetric_l3l4+udp")) {
+        mp->fields = NX_HASH_FIELDS_SYMMETRIC_L3L4_UDP;
     } else {
         return xasprintf("%s: unknown fields `%s'", s_, fields);
     }
@@ -247,6 +193,10 @@ multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s)
     if (error) {
         return error;
     }
+    if (!mf_nxm_header(mp->dst.field->id)) {
+        return xasprintf("%s: experimenter OXM field '%s' not supported",
+                         s, dst);
+    }
     if (mp->dst.n_bits < 16 && n_links > (1u << mp->dst.n_bits)) {
         return xasprintf("%s: %d-bit destination field has %u possible "
                          "values, less than specified n_links %d",
@@ -261,7 +211,7 @@ multipath_parse__(struct ofpact_multipath *mp, const char *s_, char *s)
  *
  * Returns NULL if successful, otherwise a malloc()'d string describing the
  * error.  The caller is responsible for freeing the returned string. */
-char * WARN_UNUSED_RESULT
+char * OVS_WARN_UNUSED_RESULT
 multipath_parse(struct ofpact_multipath *mp, const char *s_)
 {
     char *s = xstrdup(s_);