#include "ofpbuf.h"
#include "ofp-print.h"
#include "ofp-util.h"
-#include "pcap.h"
+#include "pcap-file.h"
#include "util.h"
#include "vlog.h"
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;
-
+ union flow_in_port in_port_;
n++;
retval = pcap_read(pcap, &packet);
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);
+ in_port_.ofp_port = u16_to_ofp(1);
+ flow_extract(packet, 0, 0, NULL, &in_port_, &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);
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);