diff --git a/doc/shadowsocks-libev.asciidoc b/doc/shadowsocks-libev.asciidoc index 3f3448d5..78cd4d70 100644 --- a/doc/shadowsocks-libev.asciidoc +++ b/doc/shadowsocks-libev.asciidoc @@ -136,6 +136,9 @@ Enable port reuse. + Only available with Linux kernel > 3.9.0. +--no-delay:: +Enable TCP_NODELAY. + --acl :: Enable ACL (Access Control List) and specify config file. + diff --git a/doc/ss-local.asciidoc b/doc/ss-local.asciidoc index f87f8a39..931fcd54 100644 --- a/doc/ss-local.asciidoc +++ b/doc/ss-local.asciidoc @@ -13,7 +13,8 @@ SYNOPSIS [-k ] [-m ] [-f ] [-t ] [-c ] [-i ] [-a ] [-b ] [-n ] - [--fast-open] [--reuse-port] [--acl ] [--mtu ] + [--fast-open] [--reuse-port] [--acl ] + [--mtu ] [--no-delay] [--plugin ] [--plugin-opts ] [--password ] [--key ] @@ -124,6 +125,9 @@ Enable Multipath TCP. + Only available with MPTCP enabled Linux kernel. +--no-delay:: +Enable TCP_NODELAY. + --plugin :: Enable SIP003 plugin. (Experimental) diff --git a/doc/ss-redir.asciidoc b/doc/ss-redir.asciidoc index 242349c2..f9195b31 100644 --- a/doc/ss-redir.asciidoc +++ b/doc/ss-redir.asciidoc @@ -12,7 +12,7 @@ SYNOPSIS [-s ] [-p ] [-l ] [-k ] [-m ] [-f ] [-t ] [-c ] [-b ] - [-a ] [-n ] [--mtu ] + [-a ] [-n ] [--mtu ] [--no-delay] [--plugin ] [--plugin-opts ] [--password ] [--key ] @@ -109,6 +109,9 @@ Enable port reuse. + Only available with Linux kernel > 3.9.0. +--no-delay:: +Enable TCP_NODELAY. + --plugin :: Enable SIP003 plugin. (Experimental) diff --git a/doc/ss-server.asciidoc b/doc/ss-server.asciidoc index 06fd36ea..866f0605 100644 --- a/doc/ss-server.asciidoc +++ b/doc/ss-server.asciidoc @@ -13,8 +13,8 @@ SYNOPSIS [-k ] [-m ] [-f ] [-t ] [-c ] [-i ] [-a ] [-d ] [-n ] - [-b ] [--fast-open] [--reuse-port] [--mptcp] - [--acl ] [--mtu ] + [-b ] [--fast-open] [--reuse-port] + [--mptcp] [--acl ] [--mtu ] [--no-delay] [--manager-address ] [--plugin ] [--plugin-opts ] [--password ] [--key ] @@ -113,6 +113,9 @@ Enable port reuse. + Only available with Linux kernel > 3.9.0. +--no-delay:: +Enable TCP_NODELAY. + --acl :: Enable ACL (Access Control List) and specify config file. diff --git a/doc/ss-tunnel.asciidoc b/doc/ss-tunnel.asciidoc index e6d3667e..b4b3e6ec 100644 --- a/doc/ss-tunnel.asciidoc +++ b/doc/ss-tunnel.asciidoc @@ -13,7 +13,7 @@ SYNOPSIS [-k ] [-m ] [-f ] [-t ] [-c ] [-i ] [-b ] [-a ] [-n ] - [-L addr:port] [--mtu ] [--mptcp] [--reuse-port] + [-L addr:port] [--mtu ] [--mptcp] [--reuse-port] [--no-delay] [--plugin ] [--plugin-opts ] [--key ] @@ -121,6 +121,9 @@ Enable port reuse. + Only available with Linux kernel > 3.9.0. +--no-delay:: +Enable TCP_NODELAY. + --plugin :: Enable SIP003 plugin. (Experimental) diff --git a/src/utils.c b/src/utils.c index afa99e84..24c53f37 100644 --- a/src/utils.c +++ b/src/utils.c @@ -379,6 +379,8 @@ usage() " [--mptcp] Enable Multipath TCP on MPTCP Kernel.\n"); #endif #ifndef MODULE_MANAGER + printf( + " [--no-delay] Enable TCP_NODELAY.\n"); printf( " [--key ] Key of your remote server.\n"); #endif