diff options
| author | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:34:04 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:38:58 +0200 |
| commit | 4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch) | |
| tree | 30ee606da82b0cbcb11ebb303196afb29f4e65e7 /extensions/libxt_conntrack.man | |
| parent | ec40b897289745da3d67de2cb14be30353003922 (diff) | |
| parent | 7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff) | |
Merge branch 'master' of git://git.inai.de/iptables
Conflicts:
extensions/GNUmakefile.in
Resolution: trivial, since this was a fuzz 3.
Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes
from v1.4.15-22-g4496801.
Diffstat (limited to 'extensions/libxt_conntrack.man')
| -rw-r--r-- | extensions/libxt_conntrack.man | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extensions/libxt_conntrack.man b/extensions/libxt_conntrack.man index c397f742..15fd1ddf 100644 --- a/extensions/libxt_conntrack.man +++ b/extensions/libxt_conntrack.man @@ -42,23 +42,23 @@ specified at all, matches packets in both directions. States for \fB\-\-ctstate\fP: .TP \fBINVALID\fP -meaning that the packet is associated with no known connection +The packet is associated with no known connection. .TP \fBNEW\fP -meaning that the packet has started a new connection, or otherwise associated -with a connection which has not seen packets in both directions, and +The packet has started a new connection, or otherwise associated +with a connection which has not seen packets in both directions. .TP \fBESTABLISHED\fP -meaning that the packet is associated with a connection which has seen packets -in both directions, +The packet is associated with a connection which has seen packets +in both directions. .TP \fBRELATED\fP -meaning that the packet is starting a new connection, but is associated with an +The packet is starting a new connection, but is associated with an existing connection, such as an FTP data transfer, or an ICMP error. .TP \fBUNTRACKED\fP -meaning that the packet is not tracked at all, which happens if you use -the NOTRACK target in raw table. +The packet is not tracked at all, which happens if you explicitly untrack it +by using \-j CT \-\-notrack in the raw table. .TP \fBSNAT\fP A virtual state, matching if the original source address differs from the reply @@ -74,7 +74,7 @@ Statuses for \fB\-\-ctstatus\fP: None of the below. .TP \fBEXPECTED\fP -This is an expected connection (i.e. a conntrack helper set it up) +This is an expected connection (i.e. a conntrack helper set it up). .TP \fBSEEN_REPLY\fP Conntrack has seen packets in both directions. |