src/config/opt.c: parse localhost(r-host parametr '-a') as 127.0.0.1

src/Makefile.am: some change for uninstall
teonet-co · Aug 26, 2019 · e2bc562 · e2bc562
1 parent 474b8f6
commit e2bc562
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -97,7 +97,8 @@ DEFS = @DEFS@ -DLOCALEDIR=\"${localedir}\"
 
 #nodist_include_HEADERS = config/config.h.in
 teonetincludedir=$(includedir)/teonet
-
+teobaseincludedir=$(includedir)/teobase
+teocclincludedir=$(includedir)/teoccl
 #teonetinclude_HEADERS =
 nobase_teonetinclude_HEADERS = \
     crypt.h \
@@ -223,3 +224,6 @@ libteonet_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBRARY_MAJOR_VERSION):0:0
 
 uninstall-local:
 	-rm -r $(teonetincludedir)
+	-rm -r $(teobaseincludedir)
+	-rm -r $(teocclincludedir)
+
diff --git a/src/config/opt.c b/src/config/opt.c
@@ -206,9 +206,15 @@ char ** ksnet_optRead(int argc, char **argv, ksnet_cfg *conf,
           conf->r_tcp_port = atoi(optarg);
           break;
 
-        case 'a':
-          strncpy((char*)conf->r_host_addr, optarg, KSN_BUFFER_SM_SIZE/2);
-          break;
+        case 'a': {
+          const char *localhost_str = "localhost";
+          const char *localhost_num = "127.0.0.1";
+          if (!strncmp(localhost_str, optarg, strlen(localhost_str))) {
+              strncpy((char*)conf->r_host_addr, localhost_num, strlen(localhost_num));
+          } else {
+              strncpy((char*)conf->r_host_addr, optarg, KSN_BUFFER_SM_SIZE/2);
+          }
+        } break;
 
         case 'i':
           strncpy((char*)conf->vpn_ip, optarg, KSN_BUFFER_SM_SIZE/2);