[ovs-dev] [patch v8 6/9] ipf: Add command to disable fragmentation handling.

[Justin Pettit]

> On Jul 16, 2018, at 4:39 PM, Darrell Ball <dlu998 at gmail.com> wrote:
> 
> diff --git a/lib/dpctl.man b/lib/dpctl.man
> index 5d987e6..a1eb026 100644
> --- a/lib/dpctl.man
> +++ b/lib/dpctl.man
> @@ -272,3 +272,18 @@ Only supported for userspace datapath.
> \*(DX\fBct\-get\-nconns\fR [\fIdp\fR]
> Prints the current number of connection tracker entries on \fIdp\fR.
> Only supported for userspace datapath.
> +.
> +.TP
> +\*(DX\fBipf\-set\-enabled\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR
> +Enables fragmentation handling for the userspace datapath connection
> +tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  When fragmentation
> +handling is enabled, the rules for handling fragments before entering
> +conntrack should not differentiate between first and other fragments.  If
> +there is a need to differentiate between first and other fragments, do it
> +after conntrack.  Both v4 and v6 are enabled by default.

I'm not sure that I understand the two sentences that begins at "When fragmentation handling is enabled..."  It's a great idea to explain what users should expect with the fragment reassembly and how the userspace implementation may differ from the kernel one.  However, I think that would better fit in "Documentation/topics/design.rst" instead of this man page fragment.

Let's remove it from here.  Can you add the appropriate documentation to that design file?

> +\*(DX\fBipf\-set\-disabled\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR
> +Disables fragmentation handling for the userspace datapath connection
> +tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  Both v4 and v6 are
> +enabled by default.

I think we can combine these two commands into one group, which will make it a bit more compact.

I'd like to commit it with the incremental at the bottom of this message.

--Justin


-=-=-=-=-=-=-=-=-

diff --git a/NEWS b/NEWS
index 2d79a2aac6cd..f5fe0ef9f392 100644
--- a/NEWS
+++ b/NEWS
@@ -20,10 +20,8 @@ v2.10.0 - xx xxx xxxx
        use --names or --no-names to override.  See ovs-ofctl(8) for details.
    - Userspace datapath:
      * Add v4/v6 fragmentation support for conntrack.
-     * New "ovs-appctl dpctl/ipf-set-enabled" command for userspace datapath
-       conntrack fragmentation support.
-     * New "ovs-appctl dpctl/ipf-set-disabled" command for userspace datapath
-       conntrack fragmentation support.
+     * New ovs-appctl "dpctl/ipf-set-enabled" and "dpctl/ipf-set-disabled"
+       commands for userspace datapath conntrack fragmentation support.
    - ovs-vsctl: New commands "add-bond-iface" and "del-bond-iface".
    - OpenFlow:
      * OFPT_ROLE_STATUS is now available in OpenFlow 1.3.
diff --git a/lib/dpctl.c b/lib/dpctl.c
index d6800fb2db99..1d3a8f80268e 100644
--- a/lib/dpctl.c
+++ b/lib/dpctl.c
@@ -1705,7 +1705,7 @@ ipf_set_enabled__(int argc, const char *argv[], struct dpctl_params *dpctl_p,
         } else {
             error = EINVAL;
             dpctl_error(dpctl_p, error,
-                        "parameter missing: 'v4' for ipv4 or 'v6' for ipv6");
+                        "parameter missing: 'v4' for IPv4 or 'v6' for IPv6");
         }
         dpif_close(dpif);
     }
diff --git a/lib/dpctl.man b/lib/dpctl.man
index a1eb0260be18..c231cff7d161 100644
--- a/lib/dpctl.man
+++ b/lib/dpctl.man
@@ -275,15 +275,9 @@ Only supported for userspace datapath.
 .
 .TP
 \*(DX\fBipf\-set\-enabled\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR
-Enables fragmentation handling for the userspace datapath connection
-tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  When fragmentation
-handling is enabled, the rules for handling fragments before entering
-conntrack should not differentiate between first and other fragments.  If
-there is a need to differentiate between first and other fragments, do it
-after conntrack.  Both v4 and v6 are enabled by default.
-.
-.TP
+.TQ
 \*(DX\fBipf\-set\-disabled\fR [\fIdp\fR] \fBv4\fR|\fBv6\fR
-Disables fragmentation handling for the userspace datapath connection
-tracker.  Either \fBv4\fR or \fBv6\fR must be specified.  Both v4 and v6 are
-enabled by default.
+Enables or disables IP fragmentation handling for the userspace
+connection tracker.  Either \fBv4\fR or \fBv6\fR must be specified.
+Both IPv4 and IPv6 fragment reassembly are enabled by default.  Only
+supported for userspace datapath.