X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-flows.c;h=3d31aae1643297c944f333881911d5877241a6f2;hb=fb8c93473efacd67a50117d0f2a3084f2d96ceca;hp=451ca1ad0ea5f8e1c72d9a2ac8d118a32632845f;hpb=c69ee87c10818267f991236201150b1fa51ae519;p=openvswitch diff --git a/tests/test-flows.c b/tests/test-flows.c index 451ca1ad..3d31aae1 100644 --- a/tests/test-flows.c +++ b/tests/test-flows.c @@ -39,8 +39,6 @@ main(int argc OVS_UNUSED, char *argv[]) int n = 0, errors = 0; set_program_name(argv[0]); - time_init(); - vlog_init(); flows = stdin; pcap = fdopen(3, "rb"); @@ -67,8 +65,8 @@ main(int argc OVS_UNUSED, char *argv[]) ovs_fatal(retval, "error reading pcap file"); } - flow_extract(packet, 1, &flow); - flow_to_match(&flow, 0, &extracted_match); + flow_extract(packet, 0, 1, &flow); + flow_to_match(&flow, 0, false, &extracted_match); if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) { char *exp_s = ofp_match_to_string(&expected_match, 2); @@ -77,6 +75,7 @@ main(int argc OVS_UNUSED, char *argv[]) printf("mismatch on packet #%d (1-based).\n", n); printf("Packet:\n"); ofp_print_packet(stdout, packet->data, packet->size, packet->size); + ovs_hex_dump(stdout, packet->data, packet->size, 0, true); printf("Expected flow:\n%s\n", exp_s); printf("Actually extracted flow:\n%s\n", got_s); printf("\n");