This patch changes the delimiter of ct_state in --ct-next from comma or space to vertical bar. The new format will be easier to parse when the --ct-next options support more ct_fields such as ct_mark and ct_label.
Signed-off-by: Yi-Hung Wei <[email protected]> --- ofproto/ofproto-dpif-trace.c | 2 +- ofproto/ofproto-unixctl.man | 6 +++--- tests/ofproto-dpif.at | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ofproto/ofproto-dpif-trace.c b/ofproto/ofproto-dpif-trace.c index 9303ea18c237..d00d41a89cab 100644 --- a/ofproto/ofproto-dpif-trace.c +++ b/ofproto/ofproto-dpif-trace.c @@ -199,7 +199,7 @@ parse_oftrace_options(int argc, const char *argv[], } uint32_t ct_state; - if (!parse_ct_state(argv[++k], 0, ", ", &ct_state, &ds)) { + if (!parse_ct_state(argv[++k], 0, "|", &ct_state, &ds)) { return ds_steal_cstr(&ds); } if (!validate_ct_state(ct_state, &ds)) { diff --git a/ofproto/ofproto-unixctl.man b/ofproto/ofproto-unixctl.man index f511c392b548..abc9481f0faf 100644 --- a/ofproto/ofproto-unixctl.man +++ b/ofproto/ofproto-unixctl.man @@ -55,8 +55,8 @@ wildcards.) \fIbridge\fR names of the bridge through which When the traced flow triggers conntrack actions, \fBofproto/trace\fR will automatically trace the forked packet processing pipeline with user specified ct_state. This option sets the ct_state flags that the -conntrack module will report. The \fIflags\fR must be a comma- or -space-separated list of the following connection tracking flags: +conntrack module will report. The \fIflags\fR must be a vertical +bar separated list of the following connection tracking flags: . .RS .IP \(bu @@ -89,7 +89,7 @@ changed. . .IP When --ct-next is unspecified, or when there are fewer --ct-next options than -ct actions, the \fIflags\fR default to trk,new. +ct actions, the \fIflags\fR default to trk|new. . .RE . diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at index c76ea4eee1cc..7353cbd6289a 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -9862,7 +9862,7 @@ AT_CHECK([tail -1 stdout], [0], [Datapath actions: ct(commit,zone=2),4 ]) -AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1,tcp' --ct-next 'trk,est' --ct-next 'trk,est' ], [0], [stdout]) +AT_CHECK([ovs-appctl ofproto/trace br0 'in_port=1,tcp' --ct-next 'trk|est' --ct-next 'trk|est' ], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], [Datapath actions: 3 ]) -- 2.7.4 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
