github/nps
1
0
Fork 0
mirror of https://github.com/ehang-io/nps.git synced 2025-07-03 13:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
刘河 2019-09-24 23:11:59 +08:00
commit c062cc414a
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/bridge.go
View File

@ -473,6 +473,7 @@ loop:
tl.Remark = t.Remark tl.Remark = t.Remark
} else { } else {
tl.Remark = t.Remark + "_" + strconv.Itoa(tl.Port) tl.Remark = t.Remark + "_" + strconv.Itoa(tl.Port)
tl.Target = new(file.Target)
if t.TargetAddr != "" { if t.TargetAddr != "" {
tl.Target.TargetStr = t.TargetAddr + ":" + strconv.Itoa(targets[i]) tl.Target.TargetStr = t.TargetAddr + ":" + strconv.Itoa(targets[i])
} else { } else {

4
lib/config/config.go
View File

@ -227,8 +227,10 @@ func dealTunnel(s string) *file.Tunnel {
t.ServerIp = item[1] t.ServerIp = item[1]
case "mode": case "mode":
t.Mode = item[1] t.Mode = item[1]
case "target_port", "target_addr": case "target_addr":
t.Target.TargetStr = strings.Replace(item[1], ",", "\n", -1) t.Target.TargetStr = strings.Replace(item[1], ",", "\n", -1)
case "target_port":
t.Target.TargetStr = item[1]
case "target_ip": case "target_ip":
t.TargetAddr = item[1] t.TargetAddr = item[1]
case "password": case "password":

2
lib/version/version.go
View File

@ -1,6 +1,6 @@
package version package version
const VERSION = "0.23.1" const VERSION = "0.23.2"
// Compulsory minimum version, Minimum downward compatibility to this version // Compulsory minimum version, Minimum downward compatibility to this version
func GetVersion() string { func GetVersion() string {