network: rename SendRawOption= to SendOption=
As DHCPv4.SendOption= and DHCPServer.SendRawOption= take the same format.
This commit is contained in:
parent
a2870138c1
commit
d8b736bd0c
|
@ -1643,14 +1643,13 @@
|
||||||
<term><varname>SendOption=</varname></term>
|
<term><varname>SendOption=</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Send an arbitrary option in the DHCPv4 request. Takes a DHCP option number, data type
|
<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>:
|
and data separated with a colon
|
||||||
<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>). The option
|
(<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
|
||||||
number must be an interger in the range 1..254. The type takes one of
|
The option number must be an interger in the range 1..254. The type takes one of <literal>uint8</literal>,
|
||||||
<literal>uint8</literal>, <literal>uint16</literal>, <literal>uint32</literal>,
|
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
|
||||||
<literal>ipv4address</literal>, or <literal>string</literal>.
|
<literal>string</literal>. Special characters in the data string may be escaped using
|
||||||
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
|
<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>
|
then all options specified earlier are cleared. Defaults to unset.</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
@ -1905,16 +1904,17 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>SendRawOption=</varname></term>
|
<term><varname>SendOption=</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Send a raw option with value via DHCPv4 server. Takes a DHCP option, data type and data
|
<para>Send a raw option with value via DHCPv4 server. Takes a DHCP option number, data type
|
||||||
(option:type:value). The option ranges [1-254]. The type takes one of <literal>uint8</literal>,
|
and data (<literal><replaceable>option</replaceable>:<replaceable>type</replaceable>:<replaceable>value</replaceable></literal>).
|
||||||
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or <literal>string</literal>.
|
The option number is an integer in the range 1..254. The type takes one of <literal>uint8</literal>,
|
||||||
Special characters in the data string may be escaped using
|
<literal>uint16</literal>, <literal>uint32</literal>, <literal>ipv4address</literal>, or
|
||||||
<ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
|
<literal>string</literal>. Special characters in the data string may be escaped using
|
||||||
escapes</ulink>. This option can be specified multiple times. If an empty string is specified, then all
|
<ulink url="https://en.wikipedia.org/wiki/Escape_sequences_in_C#Table_of_escape_sequences">C-style
|
||||||
options specified earlier are cleared. Defaults to unset.</para>
|
escapes</ulink>. This setting can be specified multiple times. If an empty string is specified,
|
||||||
</listitem>
|
then all options specified earlier are cleared. Defaults to unset.</para>
|
||||||
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
</variablelist>
|
</variablelist>
|
||||||
|
|
|
@ -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 *unit,
|
||||||
const char *filename,
|
const char *filename,
|
||||||
unsigned line,
|
unsigned line,
|
||||||
|
|
|
@ -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_dns);
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_ntp);
|
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_ntp);
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_dhcp_server_sip);
|
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);
|
||||||
|
|
|
@ -200,7 +200,7 @@ DHCPServer.EmitTimezone, config_parse_bool,
|
||||||
DHCPServer.Timezone, config_parse_timezone, 0, offsetof(Network, dhcp_server_timezone)
|
DHCPServer.Timezone, config_parse_timezone, 0, offsetof(Network, dhcp_server_timezone)
|
||||||
DHCPServer.PoolOffset, config_parse_uint32, 0, offsetof(Network, dhcp_server_pool_offset)
|
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.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.Cost, config_parse_uint32, 0, offsetof(Network, cost)
|
||||||
Bridge.UseBPDU, config_parse_tristate, 0, offsetof(Network, use_bpdu)
|
Bridge.UseBPDU, config_parse_tristate, 0, offsetof(Network, use_bpdu)
|
||||||
Bridge.HairPin, config_parse_tristate, 0, offsetof(Network, hairpin)
|
Bridge.HairPin, config_parse_tristate, 0, offsetof(Network, hairpin)
|
||||||
|
|
|
@ -259,7 +259,7 @@ MaxLeaseTimeSec=
|
||||||
DefaultLeaseTimeSec=
|
DefaultLeaseTimeSec=
|
||||||
EmitTimezone=
|
EmitTimezone=
|
||||||
DNS=
|
DNS=
|
||||||
SendRawOption=
|
SendOption=
|
||||||
[NextHop]
|
[NextHop]
|
||||||
Id=
|
Id=
|
||||||
Gateway=
|
Gateway=
|
||||||
|
|
Loading…
Reference in a new issue