ofproto: Factor out code from do_xlate_actions() into new function.

[openvswitch] / tests / test-flows.c

diff --git a/tests/test-flows.c b/tests/test-flows.c
index 663c5a6d1018bf58003eb130bf6502ee83f6769c..a4649b3f81de1e38202eecaec5454b4cbebf465f 100644 (file)
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2009, 2010 Nicira Networks.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <config.h>
 #include "flow.h"
 #include <errno.h>
@@ -15,7 +31,7 @@
 #include <assert.h>
 
 int
-main(int argc UNUSED, char *argv[])
+main(int argc OVS_UNUSED, char *argv[])
 {
     struct ofp_match expected_match;
     FILE *flows, *pcap;
@@ -23,8 +39,6 @@ main(int argc UNUSED, char *argv[])
     int n = 0, errors = 0;
 
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
 
     flows = stdin;
     pcap = fdopen(3, "rb");
@@ -40,7 +54,7 @@ main(int argc UNUSED, char *argv[])
     while (fread(&expected_match, sizeof expected_match, 1, flows)) {
         struct ofpbuf *packet;
         struct ofp_match extracted_match;
-        flow_t flow;
+        struct flow flow;
 
         n++;
 
@@ -51,8 +65,8 @@ main(int argc UNUSED, char *argv[])
             ovs_fatal(retval, "error reading pcap file");
         }
 
-        flow_extract(packet, 1, &flow);
-        flow_to_match(&flow, 0, &extracted_match);
+        flow_extract(packet, 0, 1, &flow);
+        flow_to_match(&flow, 0, false, &extracted_match);
 
         if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
             char *exp_s = ofp_match_to_string(&expected_match, 2);
@@ -61,6 +75,7 @@ main(int argc UNUSED, char *argv[])
             printf("mismatch on packet #%d (1-based).\n", n);
             printf("Packet:\n");
             ofp_print_packet(stdout, packet->data, packet->size, packet->size);
+            ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
             printf("Expected flow:\n%s\n", exp_s);
             printf("Actually extracted flow:\n%s\n", got_s);
             printf("\n");