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");
}
struct ofp10_match extracted_match;
struct match match;
struct flow flow;
- union flow_in_port in_port_;
n++;
- retval = pcap_read(pcap, &packet, NULL);
+ 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");
}
- in_port_.ofp_port = u16_to_ofp(1);
- flow_extract(packet, 0, 0, NULL, &in_port_, &flow);
+ 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);