X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-flows.c;h=559af3a315cbae1b23b40626541cdfcc052448e6;hb=09eda55c4a3ef0215fea797c73cc2ba5778af8ca;hp=451ca1ad0ea5f8e1c72d9a2ac8d118a32632845f;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=openvswitch

diff --git a/tests/test-flows.c b/tests/test-flows.c
index 451ca1ad..559af3a3 100644
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,12 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include "classifier.h"
 #include "openflow/openflow.h"
 #include "timeval.h"
 #include "ofpbuf.h"
 #include "ofp-print.h"
+#include "ofp-util.h"
 #include "pcap.h"
 #include "util.h"
 #include "vlog.h"
@@ -39,8 +41,6 @@ main(int argc OVS_UNUSED, char *argv[])
     int n = 0, errors = 0;
 
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
 
     flows = stdin;
     pcap = fdopen(3, "rb");
@@ -56,7 +56,8 @@ main(int argc OVS_UNUSED, char *argv[])
     while (fread(&expected_match, sizeof expected_match, 1, flows)) {
         struct ofpbuf *packet;
         struct ofp_match extracted_match;
-        flow_t flow;
+        struct cls_rule rule;
+        struct flow flow;
 
         n++;
 
@@ -67,8 +68,9 @@ main(int argc OVS_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);
+        cls_rule_init_exact(&flow, 0, &rule);
+        ofputil_cls_rule_to_match(&rule, &extracted_match);
 
         if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
             char *exp_s = ofp_match_to_string(&expected_match, 2);
@@ -77,6 +79,7 @@ main(int argc OVS_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");