X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-flows.c;h=a49814295832b665ebbb74a34bb7825875921fba;hb=03fbdf8d9c80a5c2d517faecfa025c8b2ee505d3;hp=451ca1ad0ea5f8e1c72d9a2ac8d118a32632845f;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=sliver-openvswitch.git

diff --git a/tests/test-flows.c b/tests/test-flows.c
index 451ca1ad0..a49814295 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, 2012, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,11 +19,13 @@
 #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 "pcap.h"
+#include "ofp-util.h"
+#include "pcap-file.h"
 #include "util.h"
 #include "vlog.h"
 
@@ -33,14 +35,12 @@
 int
 main(int argc OVS_UNUSED, char *argv[])
 {
-    struct ofp_match expected_match;
+    struct ofp10_match expected_match;
     FILE *flows, *pcap;
     int retval;
     int n = 0, errors = 0;
 
     set_program_name(argv[0]);
-    time_init();
-    vlog_init();
 
     flows = stdin;
     pcap = fdopen(3, "rb");
@@ -48,37 +48,44 @@ main(int argc OVS_UNUSED, char *argv[])
         ovs_fatal(errno, "failed to open fd 3 for reading");
     }
 
-    retval = pcap_read_header(pcap);
+    retval = ovs_pcap_read_header(pcap);
     if (retval) {
         ovs_fatal(retval > 0 ? retval : 0, "reading pcap header failed");
     }
 
     while (fread(&expected_match, sizeof expected_match, 1, flows)) {
         struct ofpbuf *packet;
-        struct ofp_match extracted_match;
-        flow_t flow;
-
+        struct ofp10_match extracted_match;
+        struct match match;
+        struct flow flow;
         n++;
 
-        retval = pcap_read(pcap, &packet);
+        retval = ovs_pcap_read(pcap, &packet, NULL);
         if (retval == EOF) {
             ovs_fatal(0, "unexpected end of file reading pcap file");
         } else if (retval) {
             ovs_fatal(retval, "error reading pcap file");
         }
 
-        flow_extract(packet, 1, &flow);
-        flow_to_match(&flow, 0, &extracted_match);
+        flow_extract(packet, NULL, &flow);
+        flow.in_port.ofp_port = u16_to_ofp(1);
+
+        match_wc_init(&match, &flow);
+        ofputil_match_to_ofp10_match(&match, &extracted_match);
 
         if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
-            char *exp_s = ofp_match_to_string(&expected_match, 2);
-            char *got_s = ofp_match_to_string(&extracted_match, 2);
+            char *exp_s = ofp10_match_to_string(&expected_match, 2);
+            char *got_s = ofp10_match_to_string(&extracted_match, 2);
             errors++;
             printf("mismatch on packet #%d (1-based).\n", n);
             printf("Packet:\n");
-            ofp_print_packet(stdout, packet->data, packet->size, packet->size);
+            ofp_print_packet(stdout, packet->data, packet->size);
+            ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
+            match_print(&match);
             printf("Expected flow:\n%s\n", exp_s);
             printf("Actually extracted flow:\n%s\n", got_s);
+            ovs_hex_dump(stdout, &expected_match, sizeof expected_match, 0, false);
+            ovs_hex_dump(stdout, &extracted_match, sizeof extracted_match, 0, false);
             printf("\n");
             free(exp_s);
             free(got_s);