Skip to content

Commit 7cf80e3

Browse files
authored
doc: describe the default behaviour (#313)
* doc: describe the default behaviour Because for someone new, it might not be clear what it does. The idea is also to modify the welcome page on mptcpd.mptcp.dev with the same description. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> * doc: how to change the behaviour While describing what's being done by default, best to mention how to adapt that. Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> --------- Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>
1 parent e6cbd46 commit 7cf80e3

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,27 @@ information (e.g. available remote addresses), available network
1616
interfaces, request new MPTCP subflows, handle requests for subflows,
1717
etc.
1818

19+
## Behavior
20+
By default, this daemon will load the `addr_adv` plugin, which will
21+
add MPTCP endpoints with the `subflow` flag ("client" mode) for the
22+
default in-kernel path-manager. Note that this is something
23+
[NetworkManager 1.40 or newer](https://networkmanager.dev/blog/networkmanager-1-40/#mptcp-support)
24+
does by default. Having several daemons configuring the MPTCP
25+
endpoints at the same time should be avoided. This daemon is usually
26+
recommended when NetworkManager 1.40 or newer is not available, or
27+
when advanced per-connection path management is needed, using the
28+
userspace path-manager and a custom made
29+
[plugin](https://github.com/multipath-tcp/mptcpd/wiki/Plugins) using
30+
the [C API](https://mptcpd.mptcp.dev/doc/html/).
31+
32+
To change this behavior, with NetworkManager, look for the
33+
`connection.mptcp-flags` option in the
34+
[settings](https://networkmanager.dev/docs/api/latest/nm-settings-nmcli.html#nm-settings-nmcli.property.connection.mptcp-flags),
35+
while for `mptcpd`, look at the `/etc/mptcpd/mptcpd.conf` config
36+
file, or disable the service if it is not needed. Make sure not to
37+
have both NetworkManager and `mptcpd` conflicting to configure the
38+
MPTCP endpoints.
39+
1940
## Installing `mptcpd`
2041
`mptcpd` is packaged in most major distributions:
2142

mptcpd.dox

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,28 @@
1616
* interfaces, request new MPTCP subflows, handle requests for
1717
* subflows, etc.
1818
*
19+
* By default, this daemon will load the `addr_adv` plugin, which will
20+
* add MPTCP endpoints with the `subflow` flag ("client" mode) for the
21+
* default in-kernel path-manager. Note that this is something
22+
* [NetworkManager 1.40 or newer](https://networkmanager.dev/blog/networkmanager-1-40/#mptcp-support)
23+
* does by default. Having several daemons configuring the MPTCP
24+
* endpoints at the same time should be avoided. This daemon is usually
25+
* recommended when NetworkManager 1.40 or newer is not available, or
26+
* when advanced per-connection path management is needed, using the
27+
* userspace path-manager and a custom made
28+
* [plugin](https://github.com/multipath-tcp/mptcpd/wiki/Plugins) using
29+
* the C API that is described here.
30+
*
31+
* To change this behavior, with NetworkManager, look for the
32+
* `connection.mptcp-flags` option in the
33+
* [settings](https://networkmanager.dev/docs/api/latest/nm-settings-nmcli.html#nm-settings-nmcli.property.connection.mptcp-flags),
34+
* while for `mptcpd`, look at the `/etc/mptcpd/mptcpd.conf` config
35+
* file, or disable the service if it is not needed. Make sure not to
36+
* have both NetworkManager and `mptcpd` conflicting to configure the
37+
* MPTCP endpoints.
38+
*
1939
* @see Additional higher level documentation is available in the
20-
* [`mptcpd` Wiki](https://github.com/multipath-tcp/mptcpd/wiki).
40+
* [`mptcpd` Wiki](https://github.com/multipath-tcp/mptcpd/wiki/Plugins).
2141
*/
2242

2343
/*

0 commit comments

Comments
 (0)