network: rename SendRawOption= to SendOption=

As DHCPv4.SendOption= and DHCPServer.SendRawOption= take the same
format.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index e87ca1f28770418927a239251e8f22c6c3866aa4..8b401eeaf9454a5cf078d37fbdcbbf551444ef91 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -1643,14 +1643,13 @@
           <term><varname>SendOption=</varname></term>
           <listitem>
             <para>Send an arbitrary option in the DHCPv4 request. Takes a DHCP option number, data type
-            and data separated with a colon (<literal><replaceable>option</replaceable>:
-            <replaceable>type</replaceable>:<replaceable>value</replaceable></literal>). The option
-            number must be an interger in the range 1..254. The type takes one of
-            <literal>uint8</literal>, <literal>uint16</literal>, <literal>uint32</literal>,
-            <literal>ipv4address</literal>, or <literal>string</literal>.
-            Special characters in the data string may be escaped using
+            and data separated with a colon
+            (<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
+            The option number must be an interger in the range 1..254. The type takes one of <literal>uint8</literal>,
+            <literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
+            <literal>string</literal>. Special characters in the data string may be escaped using
             <ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
-            escapes</ulink>. This option can be specified multiple times. If an empty string is specified,
+            escapes</ulink>. This setting can be specified multiple times. If an empty string is specified,
             then all options specified earlier are cleared. Defaults to unset.</para>
           </listitem>
         </varlistentry>
@@ -1905,16 +1904,17 @@
       </varlistentry>
 
       <varlistentry>
-          <term><varname>SendRawOption=</varname></term>
-          <listitem>
-            <para>Send a raw option with value via DHCPv4 server. Takes a DHCP option, data type and data
-            (option:type:value). The option ranges [1-254]. The type takes one of <literal>uint8</literal>,
-            <literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or <literal>string</literal>.
-            Special characters in the data string may be escaped using
-            <ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
-            escapes</ulink>. This option can be specified multiple times. If an empty string is specified, then all
-            options specified earlier are cleared. Defaults to unset.</para>
-          </listitem>
+        <term><varname>SendOption=</varname></term>
+        <listitem>
+          <para>Send a raw option with value via DHCPv4 server. Takes a DHCP option number, data type
+          and data (<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
+          The option number is an integer in the range 1..254. The type takes one of <literal>uint8</literal>,
+          <literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
+          <literal>string</literal>. Special characters in the data string may be escaped using
+          <ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
+          escapes</ulink>. This setting can be specified multiple times. If an empty string is specified,
+          then all options specified earlier are cleared. Defaults to unset.</para>
+        </listitem>
       </varlistentry>
 
     </variablelist>

diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 79ac325926233a60e7b0aa25dfebeef2d35a1673..8102c1be96c944b0191ebe56bb948814073c3f9e 100644 (file)
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -480,7 +480,7 @@ int config_parse_dhcp_server_sip(
         }
 }
 
-int config_parse_dhcp_server_raw_option_data(
+int config_parse_dhcp_server_option_data(
                 const char *unit,
                 const char *filename,
                 unsigned line,

diff --git a/src/network/networkd-dhcp-server.h b/src/network/networkd-dhcp-server.h
index e0a7799b1c0956430082523b1e90d57c15edd779..21f1f31b157344a48bbb13013d3fe8d743788e36 100644 (file)
--- a/src/network/networkd-dhcp-server.h
+++ b/src/network/networkd-dhcp-server.h
@@ -12,4 +12,4 @@ int dhcp4_server_configure(Link *link);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_dns);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_ntp);
 CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_sip);
-CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_raw_option_data);
+CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_option_data);

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index a99ef94d32ef5d8971d40f143ad375bba5e33733..928253cae0cd7de955b64712c38e462cc1dca132 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -200,7 +200,7 @@ DHCPServer.EmitTimezone,                config_parse_bool,
 DHCPServer.Timezone,                    config_parse_timezone,                           0,                             offsetof(Network, dhcp_server_timezone)
 DHCPServer.PoolOffset,                  config_parse_uint32,                             0,                             offsetof(Network, dhcp_server_pool_offset)
 DHCPServer.PoolSize,                    config_parse_uint32,                             0,                             offsetof(Network, dhcp_server_pool_size)
-DHCPServer.SendRawOption,               config_parse_dhcp_server_raw_option_data,        0,                             0
+DHCPServer.SendOption,                  config_parse_dhcp_server_option_data,            0,                             0
 Bridge.Cost,                            config_parse_uint32,                             0,                             offsetof(Network, cost)
 Bridge.UseBPDU,                         config_parse_tristate,                           0,                             offsetof(Network, use_bpdu)
 Bridge.HairPin,                         config_parse_tristate,                           0,                             offsetof(Network, hairpin)

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index a5f54610daae2c655bf24a397335a93a06597564..cb10ca306a478d47d5ad91093c25fde6a84f6b61 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -259,7 +259,7 @@ MaxLeaseTimeSec=
 DefaultLeaseTimeSec=
 EmitTimezone=
 DNS=
-SendRawOption=
+SendOption=
 [NextHop]
 Id=
 Gateway=