Browse Source

Add try to use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel.

pull/281/head
JohnnySun 9 years ago
parent
commit
4f45870970
3 changed files with 22 additions and 3 deletions
  1. 9
      src/redir.c
  2. 8
      src/server.c
  3. 8
      src/tunnel.c

9
src/redir.c

@ -47,6 +47,7 @@
#include "netutils.h"
#include "utils.h"
#include "common.h"
#include "redir.h"
#ifndef EAGAIN
@ -653,7 +654,13 @@ int main(int argc, char **argv)
usage();
exit(EXIT_FAILURE);
}
if(argc == 1) {
if(conf_path == NULL) {
conf_path = DEFAULT_CONF_PATH;
}
}
if (conf_path != NULL) {
jconf_t *conf = read_jconf(conf_path);
if (remote_num == 0) {

8
src/server.c

@ -1154,7 +1154,13 @@ int main(int argc, char **argv)
usage();
exit(EXIT_FAILURE);
}
if(argc == 1) {
if(conf_path == NULL) {
conf_path = DEFAULT_CONF_PATH;
}
}
if (conf_path != NULL) {
jconf_t *conf = read_jconf(conf_path);
if (server_num == 0) {

8
src/tunnel.c

@ -709,7 +709,13 @@ int main(int argc, char **argv)
usage();
exit(EXIT_FAILURE);
}
if(argc == 1) {
if(conf_path == NULL) {
conf_path = DEFAULT_CONF_PATH;
}
}
if (conf_path != NULL) {
jconf_t *conf = read_jconf(conf_path);
if (remote_num == 0) {

Loading…
Cancel
Save