TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2026-04-30 11:35:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

在各个地方支持IPv6

Browse Source
This commit is contained in:
刘祥超
2021-07-20 10:55:52 +08:00
parent b9e01b7738
commit a241b9a9df
7 changed files with 97 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/serverconfigs/network_address_config.go
View File

@@ -11,7 +11,7 @@ import (
var regexpSinglePort = regexp.MustCompile(`^\d+$`)
// 网络地址配置
// NetworkAddressConfig 网络地址配置
type NetworkAddressConfig struct {
Protocol Protocol `yaml:"protocol" json:"protocol"` // 协议，http、tcp、tcp4、tcp6、unix、udp等
Host string `yaml:"host" json:"host"` // 主机地址或主机名，支持变量
@@ -23,7 +23,7 @@ type NetworkAddressConfig struct {
hostHasVariables bool
}
// 初始化
// Init 初始化
func (this *NetworkAddressConfig) Init() error {
this.hostHasVariables = configutils.HasVariables(this.Host)
@@ -63,7 +63,7 @@ func (this *NetworkAddressConfig) Init() error {
return nil
}
// 所有的地址列表，不包括scheme
// Addresses 所有的地址列表，不包括scheme
func (this *NetworkAddressConfig) Addresses() []string {
if this.Protocol == ProtocolUnix {
return []string{this.Host}
@@ -72,12 +72,12 @@ func (this *NetworkAddressConfig) Addresses() []string {
result := []string{}
for i := this.minPort; i <= this.maxPort; i++ {
host := this.Host
result = append(result, host+":"+strconv.Itoa(i))
result = append(result, configutils.QuoteIP(host)+":"+strconv.Itoa(i))
}
return result
}
// 所有的地址列表，包含scheme
// FullAddresses 所有的地址列表，包含scheme
func (this *NetworkAddressConfig) FullAddresses() []string {
if this.Protocol == ProtocolUnix {
return []string{this.Protocol.String() + ":" + this.Host}
@@ -86,20 +86,20 @@ func (this *NetworkAddressConfig) FullAddresses() []string {
result := []string{}
for i := this.minPort; i <= this.maxPort; i++ {
host := this.Host
result = append(result, this.Protocol.String()+"://"+host+":"+strconv.Itoa(i))
result = append(result, this.Protocol.String()+"://"+configutils.QuoteIP(host)+":"+strconv.Itoa(i))
}
return result
}
// 选择其中一个地址
// PickAddress 选择其中一个地址
func (this *NetworkAddressConfig) PickAddress() string {
if this.maxPort > this.minPort {
return this.Host + ":" + strconv.Itoa(rands.Int(this.minPort, this.maxPort))
return configutils.QuoteIP(this.Host) + ":" + strconv.Itoa(rands.Int(this.minPort, this.maxPort))
}
return this.Host + ":" + strconv.Itoa(this.minPort)
return configutils.QuoteIP(this.Host) + ":" + strconv.Itoa(this.minPort)
}
// 判断Host是否包含变量
// HostHasVariables 判断Host是否包含变量
func (this *NetworkAddressConfig) HostHasVariables() bool {
return this.hostHasVariables
}