X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-flows.c;h=a40709a125360e1eb7ab379aa1488d33879408ed;hb=a088a1ffeba3d113c1be918969085a5c0de0d518;hp=33417e0211e8b77e55fcb6e3af071769e77c7e33;hpb=eec25dc1ae3ed49ad5e2eda0ca04450c4f75d6f7;p=openvswitch

diff --git a/tests/test-flows.c b/tests/test-flows.c
index 33417e02..a40709a1 100644
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -56,7 +56,7 @@ main(int argc OVS_UNUSED, char *argv[])
     while (fread(&expected_match, sizeof expected_match, 1, flows)) {
         struct ofpbuf *packet;
         struct ofp10_match extracted_match;
-        struct cls_rule rule;
+        struct match match;
         struct flow flow;
 
         n++;
@@ -68,9 +68,9 @@ main(int argc OVS_UNUSED, char *argv[])
             ovs_fatal(retval, "error reading pcap file");
         }
 
-        flow_extract(packet, 0, 0, 1, &flow);
-        cls_rule_init_exact(&flow, 0, &rule);
-        ofputil_cls_rule_to_ofp10_match(&rule, &extracted_match);
+        flow_extract(packet, 0, NULL, 1, &flow);
+        match_init_exact(&match, &flow);
+        ofputil_match_to_ofp10_match(&match, &extracted_match);
 
         if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
             char *exp_s = ofp10_match_to_string(&expected_match, 2);
@@ -80,7 +80,7 @@ main(int argc OVS_UNUSED, char *argv[])
             printf("Packet:\n");
             ofp_print_packet(stdout, packet->data, packet->size);
             ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
-            cls_rule_print(&rule);
+            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);