diff options
author | yalei wang <wylandrea@gmail.com> | 2018-12-27 02:28:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2018-12-27 02:28:16 +0000 |
commit | 642adb4b3f0be545c96a3cf929f2ede8a7be5b2d (patch) | |
tree | 48c10b5b26465615a07d41312469ecaa4f938799 /stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c | |
parent | 15aaddae13faf2bdf7e5d6e18a5192aedbd27e9c (diff) | |
parent | 0ca6bd545292b94501b3d89c14be8eba9cf42d22 (diff) |
Merge "Fix: change the search path"
Diffstat (limited to 'stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c')
-rw-r--r-- | stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c index e2334ea..6e10c7a 100644 --- a/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c +++ b/stacks/lwip_stack/lwip_src/ip_module/configuration_reader.c @@ -361,7 +361,14 @@ get_network_json_data () tmp_config_path = realpath ("./network_data_tonStack.json", NULL); if (!tmp_config_path) { - exit (1); + NSTCP_LOGINF ("Warning! It use the second search path ../configure"); + tmp_config_path = + realpath ("../configure/network_data_tonStack.json", NULL); + } + + if (!tmp_config_path) + { + return 1; } int fp = open (tmp_config_path, O_RDONLY); @@ -454,7 +461,13 @@ get_ip_json_data () tmp_config_path = realpath ("./ip_data.json", NULL); if (!tmp_config_path) { - exit (1); + NSTCP_LOGINF ("Warning! It use the second search path ../configure"); + tmp_config_path = realpath ("../configure/ip_data.json", NULL); + } + + if (!tmp_config_path) + { + return 1; } int fp = open (tmp_config_path, O_RDONLY); |