GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-08-30 05:01:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: move code around

Browse Source
This commit is contained in:
Toby
2023-08-23 16:26:38 -07:00
parent 3c3c2a51a8
commit 332d2ea32d
8 changed files with 137 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/cmd/client.go
View File

@@ -21,6 +21,7 @@ import (
"github.com/apernet/hysteria/app/internal/http"
"github.com/apernet/hysteria/app/internal/socks5"
"github.com/apernet/hysteria/app/internal/tproxy"
"github.com/apernet/hysteria/app/internal/utils"
"github.com/apernet/hysteria/core/client"
"github.com/apernet/hysteria/extras/obfs"
)
@@ -222,13 +223,13 @@ func (c *clientConfig) fillBandwidthConfig(hyConfig *client.Config) error {
// New core now allows users to omit bandwidth values and use built-in congestion control
var err error
if c.Bandwidth.Up != "" {
hyConfig.BandwidthConfig.MaxTx, err = convBandwidth(c.Bandwidth.Up)
hyConfig.BandwidthConfig.MaxTx, err = utils.ConvBandwidth(c.Bandwidth.Up)
if err != nil {
return configError{Field: "bandwidth.up", Err: err}
}
}
if c.Bandwidth.Down != "" {
hyConfig.BandwidthConfig.MaxRx, err = convBandwidth(c.Bandwidth.Down)
hyConfig.BandwidthConfig.MaxRx, err = utils.ConvBandwidth(c.Bandwidth.Down)
if err != nil {
return configError{Field: "bandwidth.down", Err: err}
}
@@ -369,7 +370,7 @@ func runClient(cmd *cobra.Command, args []string) {
uri := config.URI()
logger.Info("use this URI to share your server", zap.String("uri", uri))
if showQR {
printQR(uri)
utils.PrintQR(uri)
}
// Modes
@@ -594,6 +595,15 @@ func parseServerAddrString(addrStr string) (host, hostPort string) {
return h, addrStr
}
// normalizeCertHash normalizes a certificate hash string.
// It converts all characters to lowercase and removes possible separators such as ":" and "-".
func normalizeCertHash(hash string) string {
r := strings.ToLower(hash)
r = strings.ReplaceAll(r, ":", "")
r = strings.ReplaceAll(r, "-", "")
return r
}
// obfsConnFactory adds obfuscation to a function that creates net.PacketConn.
type obfsConnFactory struct {
NewFunc func(addr net.Addr) (net.PacketConn, error)