mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 04:24:32 +00:00
libnm: merge branch 'champtar:route-unreachable'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1549
This commit is contained in:
commit
90cc458d31
|
@ -1152,7 +1152,7 @@ nm_setting_ip4_config_class_init(NMSettingIP4ConfigClass *klass)
|
||||||
* </listitem>
|
* </listitem>
|
||||||
* <listitem>
|
* <listitem>
|
||||||
* <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>,
|
* <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>,
|
||||||
* <literal>unavailable</literal>, <literal>prohibit</literal>, <literal>throw</literal>.
|
* <literal>unreachable</literal>, <literal>prohibit</literal>, <literal>throw</literal>.
|
||||||
* The default is <literal>unicast</literal>.</para>
|
* The default is <literal>unicast</literal>.</para>
|
||||||
* </listitem>
|
* </listitem>
|
||||||
* <listitem>
|
* <listitem>
|
||||||
|
|
|
@ -1138,7 +1138,7 @@ nm_setting_ip6_config_class_init(NMSettingIP6ConfigClass *klass)
|
||||||
* </listitem>
|
* </listitem>
|
||||||
* <listitem>
|
* <listitem>
|
||||||
* <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>,
|
* <para><literal>"type"</literal> - one of <literal>unicast</literal>, <literal>local</literal>, <literal>blackhole</literal>,
|
||||||
* <literal>unavailable</literal>, <literal>prohibit</literal>, <literal>throw</literal>.
|
* <literal>unreachable</literal>, <literal>prohibit</literal>, <literal>throw</literal>.
|
||||||
* The default is <literal>unicast</literal>.</para>
|
* The default is <literal>unicast</literal>.</para>
|
||||||
* </listitem>
|
* </listitem>
|
||||||
* <listitem>
|
* <listitem>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
* view. That is mainly, because such objects are themselves tied to an ifindex.
|
* view. That is mainly, because such objects are themselves tied to an ifindex.
|
||||||
*
|
*
|
||||||
* However, for certain objects that's not the case. For example, policy routing
|
* However, for certain objects that's not the case. For example, policy routing
|
||||||
* rules, certain route types (blackhole, unavailable, prohibit, throw) and MPTCP
|
* rules, certain route types (blackhole, unreachable, prohibit, throw) and MPTCP
|
||||||
* endpoints require a holistic view of the system. That is, because rules and
|
* endpoints require a holistic view of the system. That is, because rules and
|
||||||
* these route types have no ifindex. For MPTCP endpoints, they have an ifindex,
|
* these route types have no ifindex. For MPTCP endpoints, they have an ifindex,
|
||||||
* however we can only configure a small number of them at a time, so we need a
|
* however we can only configure a small number of them at a time, so we need a
|
||||||
|
|
Loading…
Reference in a new issue