From: Joe Stringer Date: Wed, 13 Jan 2016 18:59:03 +0000 (-0800) Subject: {lib, utilities}: Fix ct_state constants in docs. X-Git-Tag: v2.5.0~79 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=1e9e7c037ddb2af4be20ea25b9abe5da4f71e309 {lib, utilities}: Fix ct_state constants in docs. These pieces of documentation were not updated when the CS_* flags were reordered on the OpenFlow interface. Fixes: 63bc9fb1c69f ("packets: Reorder CS_* flags to remove gap.") Signed-off-by: Joe Stringer Acked-by: Russell Bryant --- diff --git a/lib/meta-flow.h b/lib/meta-flow.h index 95090fe86..53bbc9ecb 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -747,16 +747,16 @@ enum OVS_PACKED_ENUM mf_field_id { * - Established (0x02): This is part of an already existing connection. * - Related (0x04): This is a separate connection that is related to an * existing connection. - * - Invalid (0x20): This flow could not be associated with a connection. + * - Reply (0x08): This flow is in the reply direction, ie it did not + * initiate the connection. + * - Invalid (0x10): This flow could not be associated with a connection. * This could be set for a variety of reasons, * including (but not limited to): * - L3/L4 protocol handler is not loaded/unavailable. * - L3/L4 protocol handler determines that the packet * is malformed or invalid for the current FSM stage. * - Packets are unexpected length for protocol. - * - Reply (0x40): This flow is in the reply direction, ie it did not - * initiate the connection. - * - Tracked (0x80): Connection tracking has occurred. + * - Tracked (0x20): Connection tracking has occurred. * * The "Tracked" bit corresponds to the packet_state as described in the * description of NXAST_CT action. The remaining bits correspond to diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 608f71508..1c0996d4a 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1358,14 +1358,20 @@ flow. .IP The following flags describe the state of the tracking: .RS -.IP "\fB0x80: trk\fR" -This packet is tracked, meaning that it has previously traversed the connection -tracker. If this flag is not set, then no other flags will be set. If this flag -is set, then the packet is tracked and other flags may also be set. -.IP "\fB0x40: rpl\fR" +.IP "\fB0x01: new\fR" +This is the beginning of a new connection. This flag may only be present for +uncommitted connections. +.IP "\fB0x02: est\fR" +This is part of an already existing connection. This flag may only be present +for committed connections. +.IP "\fB0x04: rel\fR" +This is a connection that is related to an existing connection, for +instance ICMP "destination unreachable" messages or FTP data connections. This +flag may only be present for committed connections. +.IP "\fB0x08: rpl\fR" The flow is in the reply direction, meaning it did not initiate the connection. This flag may only be present for committed connections. -.IP "\fB0x20: inv\fR" +.IP "\fB0x10: inv\fR" The state is invalid, meaning that the connection tracker couldn't identify the connection. This flag is a catch-all for any problems that the connection tracker may have, for example: @@ -1379,16 +1385,10 @@ modules are not loaded. .PP - Packets are unexpected length for protocol. .RE -.IP "\fB0x01: new\fR" -This is the beginning of a new connection. This flag may only be present for -uncommitted connections. -.IP "\fB0x02: est\fR" -This is part of an already existing connection. This flag may only be present -for committed connections. -.IP "\fB0x04: rel\fR" -This is a connection that is related to an existing connection, for -instance ICMP "destination unreachable" messages or FTP data connections. This -flag may only be present for committed connections. +.IP "\fB0x20: trk\fR" +This packet is tracked, meaning that it has previously traversed the connection +tracker. If this flag is not set, then no other flags will be set. If this flag +is set, then the packet is tracked and other flags may also be set. .PP This field was introduced in Open vSwitch 2.5. .RE