ofp-actions: Translate OF1.0 "enqueue" actions for OF1.1+.

[cascardo/ovs.git] / lib / multipath.c

diff --git a/lib/multipath.c b/lib/multipath.c
index 0a58c06..30bab14 100644 (file)
--- a/lib/multipath.c
+++ b/lib/multipath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2012, 2013, 2014, 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.
@@ -21,12 +21,13 @@
 #include <inttypes.h>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include "dynamic-string.h"
+#include "colors.h"
 #include "nx-match.h"
-#include "ofp-actions.h"
-#include "ofp-errors.h"
-#include "ofp-util.h"
 #include "openflow/nicira-ext.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-actions.h"
+#include "openvswitch/ofp-errors.h"
+#include "openvswitch/ofp-util.h"
 #include "packets.h"
 \f
 /* Checks that 'mp' is valid on flow.  Returns 0 if it is valid, otherwise an
@@ -246,9 +247,9 @@ multipath_format(const struct ofpact_multipath *mp, struct ds *s)
         algorithm = "<unknown>";
     }
 
-    ds_put_format(s, "multipath(%s,%"PRIu16",%s,%d,%"PRIu16",",
-                  fields, mp->basis, algorithm, mp->max_link + 1,
-                  mp->arg);
+    ds_put_format(s, "%smultipath(%s%s,%"PRIu16",%s,%d,%"PRIu16",",
+                  colors.paren, colors.end, fields, mp->basis, algorithm,
+                  mp->max_link + 1, mp->arg);
     mf_format_subfield(&mp->dst, s);
-    ds_put_char(s, ')');
+    ds_put_format(s, "%s)%s", colors.paren, colors.end);
 }