Browse Source

add `user` config option

pull/976/head
Rayson zhu 8 years ago
committed by Max Lv
parent
commit
a8fdd77fbf
8 changed files with 19 additions and 0 deletions
  1. 1
      doc/shadowsocks-libev.asciidoc
  2. 2
      src/jconf.c
  3. 1
      src/jconf.h
  4. 3
      src/local.c
  5. 3
      src/manager.c
  6. 3
      src/redir.c
  7. 3
      src/server.c
  8. 3
      src/tunnel.c

1
doc/shadowsocks-libev.asciidoc

@ -165,6 +165,7 @@ The config file equivalent of command line options is listed as example below.
| -k "PasSworD" | "password": "PasSworD"
| -m "aes-256-cfb" | "method": "aes-256-cfb"
| -t 60 | "timeout": 60
| -a nobody | "user": "nobody"
| --fast-open | "fast_open": true
| -6 | "ipv6_first": true
| -A | "auth": true

2
src/jconf.c

@ -197,6 +197,8 @@ read_jconf(const char *file)
conf.method = to_string(value);
} else if (strcmp(name, "timeout") == 0) {
conf.timeout = to_string(value);
} else if (strcmp(name, "user") == 0) {
conf.user = to_string(value);
} else if (strcmp(name, "fast_open") == 0) {
check_json_value_type(value, json_boolean,
"invalid config file: option 'fast_open' must be a boolean");

1
src/jconf.h

@ -55,6 +55,7 @@ typedef struct {
char *password;
char *method;
char *timeout;
char *user;
int auth;
int fast_open;
int nofile;

3
src/local.c

@ -1291,6 +1291,9 @@ main(int argc, char **argv)
if (timeout == NULL) {
timeout = conf->timeout;
}
if (user == NULL) {
user = conf->user;
}
if (auth == 0) {
auth = conf->auth;
}

3
src/manager.c

@ -744,6 +744,9 @@ main(int argc, char **argv)
if (timeout == NULL) {
timeout = conf->timeout;
}
if (user == NULL) {
user = conf->user;
}
#ifdef TCP_FASTOPEN
if (fast_open == 0) {
fast_open = conf->fast_open;

3
src/redir.c

@ -898,6 +898,9 @@ main(int argc, char **argv)
if (timeout == NULL) {
timeout = conf->timeout;
}
if (user == NULL) {
user = conf->user;
}
if (auth == 0) {
auth = conf->auth;
}

3
src/server.c

@ -1699,6 +1699,9 @@ main(int argc, char **argv)
if (timeout == NULL) {
timeout = conf->timeout;
}
if (user == NULL) {
user = conf->user;
}
if (auth == 0) {
auth = conf->auth;
}

3
src/tunnel.c

@ -885,6 +885,9 @@ main(int argc, char **argv)
if (timeout == NULL) {
timeout = conf->timeout;
}
if (user == NULL) {
user = conf->user;
}
if (auth == 0) {
auth = conf->auth;
}

Loading…
Cancel
Save