Skip to content

Commit d8b736b

Browse files
yuwatayuwata
committed
network: rename SendRawOption= to SendOption=
As DHCPv4.SendOption= and DHCPServer.SendRawOption= take the same format.
1 parent a287013 commit d8b736b

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎man/systemd.network.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,14 +1643,13 @@
16431643
<term><varname>SendOption=</varname></term>
16441644
<listitem>
16451645
<para>Send an arbitrary option in the DHCPv4 request. Takes a DHCP option number, data type
1646-
and data separated with a colon (<literal><replaceable>option</replaceable>:
1647-
<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>). The option
1648-
number must be an interger in the range 1..254. The type takes one of
1649-
<literal>uint8</literal>, <literal>uint16</literal>, <literal>uint32</literal>,
1650-
<literal>ipv4address</literal>, or <literal>string</literal>.
1651-
Special characters in the data string may be escaped using
1646+
and data separated with a colon
1647+
(<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
1648+
The option number must be an interger in the range 1..254. The type takes one of <literal>uint8</literal>,
1649+
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
1650+
<literal>string</literal>. Special characters in the data string may be escaped using
16521651
<ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
1653-
escapes</ulink>. This option can be specified multiple times. If an empty string is specified,
1652+
escapes</ulink>. This setting can be specified multiple times. If an empty string is specified,
16541653
then all options specified earlier are cleared. Defaults to unset.</para>
16551654
</listitem>
16561655
</varlistentry>
@@ -1905,16 +1904,17 @@
19051904
</varlistentry>
19061905

19071906
<varlistentry>
1908-
<term><varname>SendRawOption=</varname></term>
1909-
<listitem>
1910-
<para>Send a raw option with value via DHCPv4 server. Takes a DHCP option, data type and data
1911-
(option:type:value). The option ranges [1-254]. The type takes one of <literal>uint8</literal>,
1912-
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or <literal>string</literal>.
1913-
Special characters in the data string may be escaped using
1914-
<ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
1915-
escapes</ulink>. This option can be specified multiple times. If an empty string is specified, then all
1916-
options specified earlier are cleared. Defaults to unset.</para>
1917-
</listitem>
1907+
<term><varname>SendOption=</varname></term>
1908+
<listitem>
1909+
<para>Send a raw option with value via DHCPv4 server. Takes a DHCP option number, data type
1910+
and data (<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
1911+
The option number is an integer in the range 1..254. The type takes one of <literal>uint8</literal>,
1912+
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
1913+
<literal>string</literal>. Special characters in the data string may be escaped using
1914+
<ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
1915+
escapes</ulink>. This setting can be specified multiple times. If an empty string is specified,
1916+
then all options specified earlier are cleared. Defaults to unset.</para>
1917+
</listitem>
19181918
</varlistentry>
19191919

19201920
</variablelist>

‎src/network/networkd-dhcp-server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ int config_parse_dhcp_server_sip(
480480
}
481481
}
482482

483-
int config_parse_dhcp_server_raw_option_data(
483+
int config_parse_dhcp_server_option_data(
484484
const char *unit,
485485
const char *filename,
486486
unsigned line,

‎src/network/networkd-dhcp-server.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ int dhcp4_server_configure(Link *link);
1212
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_dns);
1313
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_ntp);
1414
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_sip);
15-
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_raw_option_data);
15+
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_option_data);

‎src/network/networkd-network-gperf.gperf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ DHCPServer.EmitTimezone, config_parse_bool,
200200
DHCPServer.Timezone, config_parse_timezone, 0, offsetof(Network, dhcp_server_timezone)
201201
DHCPServer.PoolOffset, config_parse_uint32, 0, offsetof(Network, dhcp_server_pool_offset)
202202
DHCPServer.PoolSize, config_parse_uint32, 0, offsetof(Network, dhcp_server_pool_size)
203-
DHCPServer.SendRawOption, config_parse_dhcp_server_raw_option_data, 0, 0
203+
DHCPServer.SendOption, config_parse_dhcp_server_option_data, 0, 0
204204
Bridge.Cost, config_parse_uint32, 0, offsetof(Network, cost)
205205
Bridge.UseBPDU, config_parse_tristate, 0, offsetof(Network, use_bpdu)
206206
Bridge.HairPin, config_parse_tristate, 0, offsetof(Network, hairpin)

‎test/fuzz/fuzz-network-parser/directives.network‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ MaxLeaseTimeSec=
259259
DefaultLeaseTimeSec=
260260
EmitTimezone=
261261
DNS=
262-
SendRawOption=
262+
SendOption=
263263
[NextHop]
264264
Id=
265265
Gateway=

0 commit comments

Comments
 (0)