idan/sshwifty-udp-telnet-http
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a better method to reload command presets

Browse Source
This commit is contained in:
NI
2020-03-12 21:18:08 +08:00
parent b2210ce2b6
commit 1009cd4284
12 changed files with 206 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/commands/commands.go
View File

@@ -24,7 +24,7 @@ import (
// New creates a new commands group
func New() command.Commands {
return command.Commands{
command.Register(newTelnet, parseTelnetConfig),
command.Register(newSSH, parseSSHConfig),
command.Register("Telnet", newTelnet, parseTelnetConfig),
command.Register("SSH", newSSH, parseSSHConfig),
}
}

28
application/commands/ssh.go
View File

@@ -203,28 +203,20 @@ func newSSH(
}
}
func parseSSHConfig(p configuration.Configuration) configuration.Configuration {
for i := range p.Presets {
if p.Presets[i].Type != "SSH" {
continue
}
func parseSSHConfig(p configuration.Preset) (configuration.Preset, error) {
oldHost := p.Host
oldHost := p.Presets[i].Host
_, _, sErr := net.SplitHostPort(p.Host)
_, _, sErr := net.SplitHostPort(p.Presets[i].Host)
if sErr != nil {
p.Presets[i].Host = net.JoinHostPort(
p.Presets[i].Host,
sshDefaultPortString)
}
if len(p.Presets[i].Host) <= 0 {
p.Presets[i].Host = oldHost
}
if sErr != nil {
p.Host = net.JoinHostPort(p.Host, sshDefaultPortString)
}
return p
if len(p.Host) <= 0 {
p.Host = oldHost
}
return p, nil
}
func (d *sshClient) Bootup(

30
application/commands/telnet.go
View File

@@ -76,30 +76,20 @@ func newTelnet(
}
}
func parseTelnetConfig(
p configuration.Configuration,
) configuration.Configuration {
for i := range p.Presets {
if p.Presets[i].Type != "Telnet" {
continue
}
func parseTelnetConfig(p configuration.Preset) (configuration.Preset, error) {
oldHost := p.Host
oldHost := p.Presets[i].Host
_, _, sErr := net.SplitHostPort(p.Host)
_, _, sErr := net.SplitHostPort(p.Presets[i].Host)
if sErr != nil {
p.Presets[i].Host = net.JoinHostPort(
p.Presets[i].Host,
telnetDefaultPortString)
}
if len(p.Presets[i].Host) <= 0 {
p.Presets[i].Host = oldHost
}
if sErr != nil {
p.Host = net.JoinHostPort(p.Host, telnetDefaultPortString)
}
return p
if len(p.Host) <= 0 {
p.Host = oldHost
}
return p, nil
}
func (d *telnetClient) Bootup(