linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dependency on named ports for SICSserver ports.

Browse Source
This commit is contained in:
Ferdi Franceschini
2013-05-16 06:41:52 +10:00
parent fc9f6f6152
commit 5baf09913c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
site_ansto/instrument/server_config.tcl
View File

@@ -53,7 +53,6 @@ if [info exists env(SOCKOFFSET)] {
} }
if {[info exists env(SICS_SIMULATION)] != 1} { if {[info exists env(SICS_SIMULATION)] != 1} {
set sicsroot ../ set sicsroot ../
source sics_ports.tcl
sics_simulation false sics_simulation false
dict for {simflag d} $SIMFLAG_VAL { dict for {simflag d} $SIMFLAG_VAL {
$simflag [dict get $d ICSVAL] $simflag [dict get $d ICSVAL]
@@ -147,11 +146,11 @@ installprotocolhandler
ServerOption statusfile $sicsroot/log/status.tcl ServerOption statusfile $sicsroot/log/status.tcl
ServerOption RedirectFile $sicsroot/log/stdout ServerOption RedirectFile $sicsroot/log/stdout
ServerOption LogFileDir $sicsroot/log ServerOption LogFileDir $sicsroot/log
ServerOption QuieckPort [get_portnum $quieckport ] ServerOption QuieckPort $quieckport
ServerOption ServerPort [get_portnum $serverport ] ServerOption ServerPort $serverport
ServerOption InterruptPort [get_portnum $interruptport ] ServerOption InterruptPort $interruptport
ServerOption TelWord sicslogin ServerOption TelWord sicslogin
ServerOption TelnetPort [get_portnum $telnetport ] ServerOption TelnetPort $telnetport
ServerOption ReadUserPasswdTimeout 600000 ServerOption ReadUserPasswdTimeout 600000
ServerOption AcceptTimeOut 10 ServerOption AcceptTimeOut 10
ServerOption ReadTimeOut 10 ServerOption ReadTimeOut 10
@@ -248,7 +247,7 @@ proc server_set_sobj_attributes {} {
::utility::set_sct_object_attributes ::utility::set_sct_object_attributes
## TODO move the following to the new ansto gumxml.tcl ## TODO move the following to the new ansto gumxml.tcl
sicslist setatt getgumtreexml privilege internal sicslist setatt getgumtreexml privilege internal
clientput "serverport [get_portnum $::serverport]" clientput "serverport $::serverport"
} message ] { } message ] {
if {$::errorCode=="NONE"} {return $message} if {$::errorCode=="NONE"} {return $message}
return -code error $message return -code error $message