ofproto-dpif: Factor NetFlow active timeouts out of flow expiration.

[openvswitch] / tests / test-flows.c

diff --git a/tests/test-flows.c b/tests/test-flows.c
index 559af3a315cbae1b23b40626541cdfcc052448e6..9d36eb174ce8ea66183de45c777da6c24feb1e94 100644 (file)
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -68,7 +68,7 @@ main(int argc OVS_UNUSED, char *argv[])
             ovs_fatal(retval, "error reading pcap file");
         }
 
-        flow_extract(packet, 0, 1, &flow);
+        flow_extract(packet, 0, 0, 1, &flow);
         cls_rule_init_exact(&flow, 0, &rule);
         ofputil_cls_rule_to_match(&rule, &extracted_match);
 
@@ -80,8 +80,11 @@ main(int argc OVS_UNUSED, char *argv[])
             printf("Packet:\n");
             ofp_print_packet(stdout, packet->data, packet->size, packet->size);
             ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
+            cls_rule_print(&rule);
             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);
+            ovs_hex_dump(stdout, &extracted_match, sizeof extracted_match, 0, false);
             printf("\n");
             free(exp_s);
             free(got_s);