Merge pull request #280 from JohnnySun/finally

When user running ss-local but not input any argument, ss-local will try...
This commit is contained in:
Max Lv
2015-03-06 11:25:46 +08:00
2 changed files with 7 additions and 0 deletions
+2
View File
@@ -37,6 +37,8 @@
#endif
#define DEFAULT_CONF_PATH "/etc/shadowsocks/config.json"
#ifndef SOL_TCP
#define SOL_TCP IPPROTO_TCP
#endif
+5
View File
@@ -963,6 +963,11 @@ int main(int argc, char **argv)
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) {