Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-31 14:33:50 +00:00
Code Releases Activity

Detect kernel support for MPTCP at runtime

Browse Source
This commit is contained in:
Maxim Galaganov
2022-06-23 10:38:32 +08:00
committed by Max Lv
parent 01dd7df1da
commit d61d09aa0c
8 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server.c
+7 -9
View File
@@ -595,11 +595,9 @@ create_and_bind(const char *host, const char *port, int mptcp)
for (/*rp = result*/; rp != NULL; rp = rp->ai_next) {
int protocol = rp->ai_protocol;
#ifdef IPPROTO_MPTCP
if (mptcp == 1) {
protocol = IPPROTO_MPTCP;
if (mptcp < 0) {
protocol = IPPROTO_MPTCP; // Enable upstream MPTCP
}
#endif
listen_sock = socket(rp->ai_family, rp->ai_socktype, protocol);
if (listen_sock == -1) {
continue;
@@ -622,7 +620,7 @@ create_and_bind(const char *host, const char *port, int mptcp)
}
}
#ifndef IPPROTO_MPTCP
// Enable out-of-tree mptcp
if (mptcp == 1) {
int i = 0;
while ((mptcp = mptcp_enabled_values[i]) > 0) {
@@ -633,10 +631,9 @@ create_and_bind(const char *host, const char *port, int mptcp)
i++;
}
if (mptcp == 0) {
ERROR("failed to enable multipath TCP");
ERROR("failed to enable out-of-tree multipath TCP");
}
}
#endif
s = bind(listen_sock, rp->ai_addr, rp->ai_addrlen);
if (s == 0) {
@@ -1874,8 +1871,9 @@ main(int argc, char **argv)
plugin_opts = optarg;
break;
case GETOPT_VAL_MPTCP:
mptcp = 1;
LOGI("enable multipath TCP");
mptcp = get_mptcp(1);
if (mptcp)
LOGI("enable multipath TCP (%s)", mptcp > 0 ? "out-of-tree" : "upstream");
break;
case GETOPT_VAL_KEY:
key = optarg;