/*
- * Copyright (c) 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
static int
parse_keys(void)
{
+ int exit_code = 0;
struct ds in;
ds_init(&in);
- vlog_set_levels_from_string("odp_util:console:dbg");
+ vlog_set_levels_from_string_assert("odp_util:console:dbg");
while (!ds_get_test_line(&in, stdin)) {
enum odp_key_fitness fitness;
struct ofpbuf odp_key;
/* Convert cls_rule back to odp_key. */
ofpbuf_uninit(&odp_key);
ofpbuf_init(&odp_key, 0);
- odp_flow_key_from_flow(&odp_key, &flow);
+ odp_flow_key_from_flow(&odp_key, &flow, flow.in_port);
+
+ if (odp_key.size > ODPUTIL_FLOW_KEY_BYTES) {
+ printf ("too long: %zu > %d\n",
+ odp_key.size, ODPUTIL_FLOW_KEY_BYTES);
+ exit_code = 1;
+ }
/* Convert odp_key to string. */
ds_init(&out);
}
ds_destroy(&in);
- return 0;
+ return exit_code;
}
static int
struct ds in;
ds_init(&in);
- vlog_set_levels_from_string("odp_util:console:dbg");
+ vlog_set_levels_from_string_assert("odp_util:console:dbg");
while (!ds_get_test_line(&in, stdin)) {
struct ofpbuf odp_actions;
struct ds out;