mirror of
https://github.com/shadowsocks/shadowsocks-libev.git
synced 2026-10-21 06:23:52 +00:00
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:
@@ -37,6 +37,8 @@
|
||||
|
||||
#endif
|
||||
|
||||
#define DEFAULT_CONF_PATH "/etc/shadowsocks/config.json"
|
||||
|
||||
#ifndef SOL_TCP
|
||||
#define SOL_TCP IPPROTO_TCP
|
||||
#endif
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user