cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow multiple sub sections for tcp/udp server (Random Port)

Browse Source
This commit is contained in:
Tim David Saxen 2018-11-29 09:57:42 +01:00 committed by GitHub
parent 40c7b4cbe5
commit b5faaa8c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/control.go
View File

@ -371,9 +371,11 @@ func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy, token string) (remoteAdd
if ctl.section != "common" { if ctl.section != "common" {
// Sub sections only allow tcp/udp // Sub sections only allow tcp/udp
if pxyMsg.ProxyType == consts.TcpProxy || pxyMsg.ProxyType == consts.UdpProxy { if pxyMsg.ProxyType == consts.TcpProxy || pxyMsg.ProxyType == consts.UdpProxy {
if _, ok := g.GlbServerSubSectionMap[ctl.section].AllowPorts[pxyMsg.RemotePort]; !ok { if pxyMsg.RemotePort != 0 { // Random port
err = fmt.Errorf("port %d number does not belong to section/token", pxyMsg.RemotePort) if _, ok := g.GlbServerSubSectionMap[ctl.section].AllowPorts[pxyMsg.RemotePort]; !ok {
return err = fmt.Errorf("port %d number does not belong to section/token", pxyMsg.RemotePort)
return
}
} }
} else { } else {
err = fmt.Errorf("proxy type '%s' only allowed with common token", pxyMsg.ProxyType) err = fmt.Errorf("proxy type '%s' only allowed with common token", pxyMsg.ProxyType)
@ -382,9 +384,11 @@ func (ctl *Control) RegisterProxy(pxyMsg *msg.NewProxy, token string) (remoteAdd
} else { } else {
// Only TCP and UDP have RemotePort parameter // Only TCP and UDP have RemotePort parameter
if pxyMsg.ProxyType == consts.TcpProxy || pxyMsg.ProxyType == consts.UdpProxy { if pxyMsg.ProxyType == consts.TcpProxy || pxyMsg.ProxyType == consts.UdpProxy {
if _, ok := g.GlbServerSubSectionMap[ctl.section].AllowPorts[pxyMsg.RemotePort]; !ok { if pxyMsg.RemotePort != 0 { // Random port
err = fmt.Errorf("port %d number does not belong to section/token", pxyMsg.RemotePort) if _, ok := g.GlbServerSubSectionMap[ctl.section].AllowPorts[pxyMsg.RemotePort]; !ok {
return err = fmt.Errorf("port %d number does not belong to section/token", pxyMsg.RemotePort)
return
}
} }
} }
} }