projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bundle: Avoid GCC 4.5 warning about possibly uninitialized value.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index 7511769421093711fa353d4eb9999e0cc9871728..a6fff256c71f35ba02f8cf92f0d37fd39d1ec3ac 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-172,6
+172,7
@@
usage(void)
" add-flows SWITCH FILE add flows from FILE\n"
" mod-flows SWITCH FLOW modify actions of matching FLOWs\n"
" del-flows SWITCH [FLOW] delete matching FLOWs\n"
" add-flows SWITCH FILE add flows from FILE\n"
" mod-flows SWITCH FLOW modify actions of matching FLOWs\n"
" del-flows SWITCH [FLOW] delete matching FLOWs\n"
+ " replace-flows SWITCH FILE replace flows with those in FILE\n"
" monitor SWITCH [MISSLEN] print packets received from SWITCH\n"
"\nFor OpenFlow switches and controllers:\n"
" probe VCONN probe whether VCONN is up\n"
" monitor SWITCH [MISSLEN] print packets received from SWITCH\n"
"\nFor OpenFlow switches and controllers:\n"
" probe VCONN probe whether VCONN is up\n"
@@
-263,11
+264,10
@@
static void *
alloc_stats_request(size_t body_len, uint16_t type, struct ofpbuf **bufferp)
{
struct ofp_stats_msg *rq;
alloc_stats_request(size_t body_len, uint16_t type, struct ofpbuf **bufferp)
{
struct ofp_stats_msg *rq;
- rq = make_openflow((offsetof(struct ofp_stats_msg, body)
- + body_len), OFPT_STATS_REQUEST, bufferp);
+ rq = make_openflow(sizeof *rq + body_len, OFPT_STATS_REQUEST, bufferp);
rq->type = htons(type);
rq->flags = htons(0);
rq->type = htons(type);
rq->flags = htons(0);
- return rq
->body
;
+ return rq
+ 1
;
}
static void
}
static void
@@
-658,7
+658,7
@@
do_flow_mod__(int argc, char *argv[], uint16_t command)
flow_mod_table_id = false;
parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id,
flow_mod_table_id = false;
parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id,
- argc > 2 ? argv[2] : "", command);
+ argc > 2 ? argv[2] : "", command
, false
);
check_final_format_for_flow_mod(flow_format);
open_vconn(argv[1], &vconn);
check_final_format_for_flow_mod(flow_format);
open_vconn(argv[1], &vconn);
@@
-951,8
+951,7
@@
fte_version_print(const struct fte_version *version)
}
ds_init(&s);
}
ds_init(&s);
- ofp_print_actions(&s, (const struct ofp_action_header *) version->actions,
- version->n_actions * sizeof *version->actions);
+ ofp_print_actions(&s, version->actions, version->n_actions);
printf(" %s\n", ds_cstr(&s));
ds_destroy(&s);
}
printf(" %s\n", ds_cstr(&s));
ds_destroy(&s);
}
@@
-1035,7
+1034,7
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
struct flow_mod fm;
ofpbuf_init(&actions, 64);
struct flow_mod fm;
ofpbuf_init(&actions, 64);
- parse_ofp_str(&fm,
&actions, ds_cstr(&s)
);
+ parse_ofp_str(&fm,
OFPFC_ADD, ds_cstr(&s), true
);
version = xmalloc(sizeof *version);
version->cookie = fm.cookie;
version = xmalloc(sizeof *version);
version->cookie = fm.cookie;
@@
-1308,7
+1307,7
@@
do_parse_flow(int argc OVS_UNUSED, char *argv[])
list_init(&packets);
parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id,
list_init(&packets);
parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id,
- argv[1], OFPFC_ADD);
+ argv[1], OFPFC_ADD
, false
);
print_packet_list(&packets);
}
print_packet_list(&packets);
}