X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Ftest-flows.c;h=2edfa35fe53588f5cc93159fd0c3970406390a66;hb=36956a7d33c9ee204fcb184484a5aaacbd9ecef8;hp=a4649b3f81de1e38202eecaec5454b4cbebf465f;hpb=ae412e7dd89489911a32c6723d4109c6d1de3a38;p=openvswitch diff --git a/tests/test-flows.c b/tests/test-flows.c index a4649b3f..2edfa35f 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -19,10 +19,12 @@ #include #include #include +#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" @@ -54,6 +56,7 @@ main(int argc OVS_UNUSED, char *argv[]) while (fread(&expected_match, sizeof expected_match, 1, flows)) { struct ofpbuf *packet; struct ofp_match extracted_match; + struct cls_rule rule; struct flow flow; n++; @@ -66,7 +69,9 @@ main(int argc OVS_UNUSED, char *argv[]) } flow_extract(packet, 0, 1, &flow); - flow_to_match(&flow, 0, false, &extracted_match); + cls_rule_init_exact(&flow, 0, &rule); + ofputil_cls_rule_to_match(&rule, NXFF_OPENFLOW10, &extracted_match, + 0, NULL); if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) { char *exp_s = ofp_match_to_string(&expected_match, 2);