projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Work on decoding OF1.1 flow_mods.
[openvswitch]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index 451ca1ad0ea5f8e1c72d9a2ac8d118a32632845f..33417e0211e8b77e55fcb6e3af071769e77c7e33 100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2009, 2010
, 2011, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,10
+19,12
@@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include "classifier.h"
#include "openflow/openflow.h"
#include "timeval.h"
#include "ofpbuf.h"
#include "ofp-print.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"
#include "pcap.h"
#include "util.h"
#include "vlog.h"
@@
-33,14
+35,12
@@
int
main(int argc OVS_UNUSED, char *argv[])
{
int
main(int argc OVS_UNUSED, char *argv[])
{
- struct ofp_match expected_match;
+ struct ofp
10
_match expected_match;
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
set_program_name(argv[0]);
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
set_program_name(argv[0]);
- time_init();
- vlog_init();
flows = stdin;
pcap = fdopen(3, "rb");
flows = stdin;
pcap = fdopen(3, "rb");
@@
-55,8
+55,9
@@
main(int argc OVS_UNUSED, char *argv[])
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
- struct ofp_match extracted_match;
- flow_t flow;
+ struct ofp10_match extracted_match;
+ struct cls_rule rule;
+ struct flow flow;
n++;
n++;
@@
-67,18
+68,23
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(retval, "error reading pcap file");
}
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 1, &flow);
- flow_to_match(&flow, 0, &extracted_match);
+ flow_extract(packet, 0, 0, 1, &flow);
+ cls_rule_init_exact(&flow, 0, &rule);
+ ofputil_cls_rule_to_ofp10_match(&rule, &extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
- char *exp_s = ofp_match_to_string(&expected_match, 2);
- char *got_s = ofp_match_to_string(&extracted_match, 2);
+ char *exp_s = ofp
10
_match_to_string(&expected_match, 2);
+ char *got_s = ofp
10
_match_to_string(&extracted_match, 2);
errors++;
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
errors++;
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
- ofp_print_packet(stdout, packet->data, packet->size, packet->size);
+ ofp_print_packet(stdout, packet->data, 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);
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);
printf("\n");
free(exp_s);
free(got_s);