[#1119] move -F flag outside DHCPv6-only section

diff --git a/doc/sphinx/man/perfdhcp.8.rst b/doc/sphinx/man/perfdhcp.8.rst
index d46c2a34fbab5a7392d75049c300fbdfa0746184..238c6c1bb7b18b871330e3d06d3435401fce6bdc 100644 (file)
--- a/doc/sphinx/man/perfdhcp.8.rst
+++ b/doc/sphinx/man/perfdhcp.8.rst
@@ -172,6 +172,13 @@ Options
    The ``-e prefix-only`` and ``-e address-and-prefix`` forms may not be used
    with the ``-4`` option.
 
+``-F release-rate``
+   Specifies the rate at which RELEASE requests are sent to a server. This value
+   is only valid when used in conjunction with the exchange rate (given
+   by ``-r rate``). Furthermore, the sum of this value and the renew-rate
+   (given by ``-f rate``) must be equal to or less than the exchange
+   rate value.
+
 ``-f renew-rate``
    Specifies the rate at which DHCPv4 or DHCPv6 renew requests are sent to a server.
    This value is only valid when used in conjunction with the exchange
@@ -342,13 +349,6 @@ The following options only apply for DHCPv6 (i.e. when ``-6`` is given).
 ``-c``
    Adds a rapid-commit option (exchanges will be SOLICIT-ADVERTISE).
 
-``-F release-rate``
-   Specifies the rate at which RELEASE requests are sent to a server. This value
-   is only valid when used in conjunction with the exchange rate (given
-   by ``-r rate``). Furthermore, the sum of this value and the renew-rate
-   (given by ``-f rate``) must be equal to or less than the exchange
-   rate value.
-
 ``-A encapsulation-level``
    Specifies that relayed traffic must be generated. The argument
    specifies the level of encapsulation, i.e. how many relay agents are

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index 3c591303f0b95b3aa101eb8e850c6cfa5d207072..9c36806c7f7d25583682ae054d5ee447be78012f 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -1221,6 +1221,11 @@ Options:
 -E<time-offset>: Offset of the (DHCPv4) secs field / (DHCPv6)
     elapsed-time option in the (second/request) template.
     The value 0 disables it.
+-F<release-rate>: Rate at which Release requests are sent to
+    a server. This value is only valid when used in conjunction with
+    the exchange rate (given by -r<rate>).  Furthermore the sum of
+    this value and the renew-rate (given by -f<rate>) must be equal
+    to or less than the exchange rate.
 -f<renew-rate>: Rate at which DHCPv4 or DHCPv6 renew requests are sent
     to a server. This value is only valid when used in conjunction
     with the exchange rate (given by -r<rate>).  Furthermore the sum of
@@ -1300,11 +1305,6 @@ DHCPv4 only options:
 
 DHCPv6 only options:
 -c: Add a rapid commit option (exchanges will be SA).
--F<release-rate>: Rate at which Release requests are sent to
-    a server. This value is only valid when used in conjunction with
-    the exchange rate (given by -r<rate>).  Furthermore the sum of
-    this value and the renew-rate (given by -f<rate>) must be equal
-    to or less than the exchange rate.
 -A<encapsulation-level>: Specifies that relayed traffic must be
     generated. The argument specifies the level of encapsulation, i.e.
     how many relay agents are simulated. Currently the only supported