Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-21 06:23:52 +00:00
Code Releases Activity

Merge pull request #281 from JohnnySun/develop

Browse Source 
Add use /etc/shadowsocks/config.json for ss-redir ss-server ss-tunnel
This commit is contained in:
Max Lv
2015-03-06 13:14:08 +08:00
parent 10fe2ec970 4f45870970
commit 06b3a16efa
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/redir.c
+8 -1
View File
@@ -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) {
src/server.c
+7 -1
View File
@@ -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) {
src/tunnel.c
+7 -1
View File
@@ -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) {