diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-09 12:38:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-09 12:38:41 -0700 |
| commit | 034508c4396919d915b14ee736d7cbdb79d6c307 (patch) | |
| tree | 21e0fb07250c7a35109cfbe7ef983acced732884 /include | |
| parent | 5ca670e58dc4452b8f47158f0e1238d7d756e8b0 (diff) | |
| parent | df62f2ec3df698e16bdc3dd44de1d337a9eac6b3 (diff) | |
Merge branch 'mptcp-introduce-msk-diag-interface'
Paolo Abeni says:
====================
mptcp: introduce msk diag interface
This series implements the diag interface for the MPTCP sockets.
Since the MPTCP protocol value can't be represented with the
current diag uAPI, the first patch introduces an extended attribute
allowing user-space to specify lager protocol values.
The token APIs are then extended to allow traversing the
whole token container.
Patch 3 carries the actual diag interface implementation, and
later patch bring-in some functional self-tests.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/inet_diag.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/mptcp.h | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h index e6f183ee8417..5ba122c1949a 100644 --- a/include/uapi/linux/inet_diag.h +++ b/include/uapi/linux/inet_diag.h @@ -65,6 +65,7 @@ enum { INET_DIAG_REQ_NONE, INET_DIAG_REQ_BYTECODE, INET_DIAG_REQ_SK_BPF_STORAGES, + INET_DIAG_REQ_PROTOCOL, __INET_DIAG_REQ_MAX, }; diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 5f2c77082d9e..9762660df741 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -86,4 +86,21 @@ enum { __MPTCP_PM_CMD_AFTER_LAST }; +#define MPTCP_INFO_FLAG_FALLBACK _BITUL(0) +#define MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED _BITUL(1) + +struct mptcp_info { + __u8 mptcpi_subflows; + __u8 mptcpi_add_addr_signal; + __u8 mptcpi_add_addr_accepted; + __u8 mptcpi_subflows_max; + __u8 mptcpi_add_addr_signal_max; + __u8 mptcpi_add_addr_accepted_max; + __u32 mptcpi_flags; + __u32 mptcpi_token; + __u64 mptcpi_write_seq; + __u64 mptcpi_snd_una; + __u64 mptcpi_rcv_nxt; +}; + #endif /* _UAPI_MPTCP_H */ |