Changeset 20615 for gsdl/trunk/gsicontrol.bat

Timestamp:

2009-09-16T15:29:02+12:00 (15 years ago)

Author:

ak19

Message:

Brought up to date with the recent changes made to server.jar and related files, including the gsicontrol.sh for Linux, so that the address resolution method (hostname from IP, IP, localhost, 127.0.0.1) can be specified by the user in the GSI dialog.

File:

• gsdl/trunk/gsicontrol.bat (modified) (3 diffs)

gsdl/trunk/gsicontrol.bat

@@ -186 +186 @@
 echo Found port %port%
 FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^externalaccess %configfile%') do set connect=%%G
-if "%connect%" == "1" (set connect=yes) else (set connect=no)
+
+if "%connect%" == "1" set allowfrom="all"& goto portcon
+FOR /F "tokens=2 delims==" %%G IN ('findstr /R ^host %configfile%') do set allowfrom=%%G
 
 :: Using CALL to jump to labels means we can return from them. BUT need to ensure
@@ -197 +199 @@
 set /p port=Enter port number to use:
 set /p connect=Allow external connections [yes/no]:
+if "%connect%" == "yes" set allowfrom="all"& goto portcon
+if "%connect%" == "y" set allowfrom="all"& goto portcon
+
+set /p allowfrom=Enter host (hostname, IP, localhost, 127.0.0.1) to use:
+goto portcon
 
 :portcon
-if "%connect%" == "yes" set allowfrom="all"& goto portcon2
-if "%connect%" == "y" set allowfrom="all"& goto portcon2
-set allowfrom="127.0.0.1"
-goto portcon2
-
-:portcon2
 if "%port%" == "" (
    echo Done
@@ -237 +238 @@
 :exit
 endlocal
-
-
-