diff --git a/README.md b/README.md index f4d1a53a..cb089a27 100644 --- a/README.md +++ b/README.md @@ -383,7 +383,7 @@ you may refer to the man pages of the applications, respectively. -k Password of your remote server. - -m Encrypt method: rc4-md5, + -m Encrypt method: rc4-md5, aes-128-gcm, aes-192-gcm, aes-256-gcm, aes-128-cfb, aes-192-cfb, aes-256-cfb, aes-128-ctr, aes-192-ctr, aes-256-ctr, @@ -395,13 +395,13 @@ you may refer to the man pages of the applications, respectively. The default cipher is chacha20-ietf-poly1305. [-a ] Run as another user. - + [-f ] The file path to store pid. [-t ] Socket timeout in seconds. [-c ] The path to config file. - + [-n ] Max number of open files. [-i ] Network interface to bind. @@ -423,32 +423,35 @@ you may refer to the man pages of the applications, respectively. [-d ] Name servers for internal DNS resolver. (only available in server mode) - + [--reuse-port] Enable port reuse. - + [--fast-open] Enable TCP fast open. with Linux kernel > 3.7.0. (only available in local and server mode) - + [--acl ] Path to ACL (Access Control List). (only available in local and server mode) - + [--manager-address ] UNIX domain socket address. (only available in server and manager mode) [--mtu ] MTU of your network interface. - + [--mptcp] Enable Multipath TCP on MPTCP Kernel. - + [--no-delay] Enable TCP_NODELAY. [--executable ] Path to the executable of ss-server. (only available in manager mode) - + + [-D ] Path to the working directory of ss-manager. + (only available in manager mode) + [--key ] Key of your remote server. - + [--plugin ] Enable SIP003 plugin. (Experimental) - + [--plugin-opts ] Set SIP003 plugin options. (Experimental) [-v] Verbose mode. diff --git a/doc/ss-manager.asciidoc b/doc/ss-manager.asciidoc index 195ca8b2..189dfa6b 100644 --- a/doc/ss-manager.asciidoc +++ b/doc/ss-manager.asciidoc @@ -12,7 +12,7 @@ SYNOPSIS [-s ] [-p ] [-l ] [-k ] [-m ] [-f ] [-t ] [-c ] [-i ] - [-b ] [-a ] + [-b ] [-a ] [-D ] [--manager-address ] [--executable ] [--fast-open] [--reuse-port] @@ -116,6 +116,11 @@ Specify the executable path of ss-server. + Only available in manager mode. +--executable :: +Specify the working directory of ss-manager. ++ +Only available in manager mode. + --plugin :: Enable SIP003 plugin. (Experimental) @@ -148,7 +153,7 @@ The format of the traffic statistics: :::: stat: {"8001":11370} There is no way to reset the traffic statistics, unless you remove the port and add it again - + EXAMPLE ------- To use `ss-manager`(1), First start it and specify necessary information. @@ -178,4 +183,3 @@ SEE ALSO `shadowsocks-libev`(8), `iptables`(8), /etc/shadowsocks-libev/config.json - diff --git a/src/manager.c b/src/manager.c index 0caf9d9b..757b7c4c 100644 --- a/src/manager.c +++ b/src/manager.c @@ -1161,7 +1161,7 @@ main(int argc, char **argv) if (strstr(homedir, "nologin") || strstr(homedir, "nonexistent") || homedir == NULL || strlen(homedir) == 0) { homedir = "/tmp"; } - LOGI("File path changed to %s", homedir); + LOGI("working directory points to %s", homedir); } working_dir_size = strlen(homedir) + 15; working_dir = ss_malloc(working_dir_size); diff --git a/src/utils.c b/src/utils.c index 16d00861..e2214e96 100644 --- a/src/utils.c +++ b/src/utils.c @@ -388,6 +388,8 @@ usage() #ifdef MODULE_MANAGER printf( " [--executable ] Path to the executable of ss-server.\n"); + printf( + " [-D ] Path to the working directory of ss-manager.\n"); #endif printf( " [--mtu ] MTU of your network interface.\n");