mirrors/hysteria
1
0
Fork 0
mirror of https://github.com/apernet/hysteria.git synced 2025-04-03 04:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore: code format

Browse source
This commit is contained in:
tobyxdd 2023-06-11 16:01:55 -07:00
parent c2025fd8b0
commit ca82106dc4
12 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/auth/external.go
View file

@ -17,7 +17,7 @@ type CmdAuthProvider struct {
Cmd string
}
func (p *CmdAuthProvider) Auth(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
func (p *CmdAuthProvider) Auth(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string) {
cmd := exec.Command(p.Cmd, addr.String(), string(auth), strconv.Itoa(int(sSend)), strconv.Itoa(int(sRecv)))
out, err := cmd.Output()
if err != nil {
@ -51,7 +51,7 @@ type authResp struct {
Msg string `json:"msg"`
}
func (p *HTTPAuthProvider) Auth(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
func (p *HTTPAuthProvider) Auth(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string) {
jbs, err := json.Marshal(&authReq{
Addr: addr.String(),
Payload: auth,

2
app/auth/funcs.go
View file

@ -24,7 +24,7 @@ func PasswordAuthFunc(rawMsg json5.RawMessage) (cs.ConnectFunc, error) {
// yes it is
pwds = []string{pwdConfig["password"]}
}
return func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
return func(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string) {
for _, pwd := range pwds {
if string(auth) == pwd {
return true, "Welcome"

4
app/cmd/acme.go
View file

@ -12,8 +12,8 @@ import (
"github.com/caddyserver/certmagic"
)
func acmeTLSConfig(domains []string, email string, disableHTTP bool, disableTLSALPN bool,
altHTTPPort int, altTLSALPNPort int,
func acmeTLSConfig(domains []string, email string, disableHTTP, disableTLSALPN bool,
altHTTPPort, altTLSALPNPort int,
) (*tls.Config, error) {
cfg := &certmagic.Config{
RenewalWindowRatio: certmagic.DefaultRenewalWindowRatio,

4
app/cmd/server.go
View file

@ -99,7 +99,7 @@ func server(config *serverConfig) {
logrus.Warn("Neither authentication nor obfuscation is turned on. " +
"Your server could be used by anyone! Are you sure this is what you want?")
}
authFunc = func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
authFunc = func(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string) {
return true, "Welcome"
}
case "password", "passwords":
@ -123,7 +123,7 @@ func server(config *serverConfig) {
default:
logrus.WithField("mode", config.Auth.Mode).Fatal("Unsupported authentication mode")
}
connectFunc := func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string) {
connectFunc := func(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string) {
ok, msg := authFunc(addr, auth, sSend, sRecv)
if !ok {
logrus.WithFields(logrus.Fields{

3
app/cmd/winvt.go
View file

@ -4,8 +4,9 @@
package main
import (
"golang.org/x/sys/windows"
"os"
"golang.org/x/sys/windows"
)
// Add console VT color mode

2
app/redirect/getsockopt_linux.go
View file

@ -8,7 +8,7 @@ import (
"unsafe"
)
func getsockopt(s uintptr, level uintptr, name uintptr, val unsafe.Pointer, vallen *uint32) (err error) {
func getsockopt(s, level, name uintptr, val unsafe.Pointer, vallen *uint32) (err error) {
_, _, e := syscall.Syscall6(syscall.SYS_GETSOCKOPT, s, level, name, uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
if e != 0 {
err = e

2
app/redirect/getsockopt_linux_386.go
View file

@ -13,7 +13,7 @@ const (
// we have to call syscall.socketcall with this trick.
func syscall_socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (n int, err syscall.Errno)
func getsockopt(s uintptr, level uintptr, name uintptr, val unsafe.Pointer, vallen *uint32) (err error) {
func getsockopt(s, level, name uintptr, val unsafe.Pointer, vallen *uint32) (err error) {
_, e := syscall_socketcall(SYS_GETSOCKOPT, s, level, name, uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
if e != 0 {
err = e

2
app/socks5/server.go
View file

@ -320,7 +320,7 @@ func (s *Server) handleUDP(c *net.TCPConn, r *socks5.Request) error {
return nil
}
func (s *Server) udpServer(clientConn *net.UDPConn, localRelayConn *net.UDPConn, hyUDP cs.HyUDPConn) {
func (s *Server) udpServer(clientConn, localRelayConn *net.UDPConn, hyUDP cs.HyUDPConn) {
var clientAddr *net.UDPAddr
buf := make([]byte, udpBufferSize)
// Local to remote

2
core/cs/client.go
View file

@ -49,7 +49,7 @@ type Client struct {
}
func NewClient(serverAddr string, auth []byte, tlsConfig *tls.Config, quicConfig *quic.Config,
pktConnFunc pktconns.ClientPacketConnFunc, sendBPS uint64, recvBPS uint64, fastOpen bool, lazyStart bool,
pktConnFunc pktconns.ClientPacketConnFunc, sendBPS, recvBPS uint64, fastOpen, lazyStart bool,
quicReconnectFunc func(err error),
) (*Client, error) {
quicConfig.DisablePathMTUDiscovery = quicConfig.DisablePathMTUDiscovery || pmtud.DisablePathMTUDiscovery

4
core/cs/server.go
View file

@ -17,7 +17,7 @@ import (
)
type (
ConnectFunc func(addr net.Addr, auth []byte, sSend uint64, sRecv uint64) (bool, string)
ConnectFunc func(addr net.Addr, auth []byte, sSend, sRecv uint64) (bool, string)
DisconnectFunc func(addr net.Addr, auth []byte, err error)
TCPRequestFunc func(addr net.Addr, auth []byte, reqAddr string, action acl.Action, arg string)
TCPErrorFunc func(addr net.Addr, auth []byte, reqAddr string, err error)
@ -53,7 +53,7 @@ type Server struct {
func NewServer(tlsConfig *tls.Config, quicConfig *quic.Config,
pktConn net.PacketConn, transport *transport.ServerTransport,
sendBPS uint64, recvBPS uint64, disableUDP bool, aclEngine *acl.Engine,
sendBPS, recvBPS uint64, disableUDP bool, aclEngine *acl.Engine,
connectFunc ConnectFunc, disconnectFunc DisconnectFunc,
tcpRequestFunc TCPRequestFunc, tcpErrorFunc TCPErrorFunc,
udpRequestFunc UDPRequestFunc, udpErrorFunc UDPErrorFunc,

8
core/pktconns/obfs/obfs.go
View file

@ -8,8 +8,8 @@ import (
)
type Obfuscator interface {
Deobfuscate(in []byte, out []byte) int
Obfuscate(in []byte, out []byte) int
Deobfuscate(in, out []byte) int
Obfuscate(in, out []byte) int
}
const xpSaltLen = 16
@ -30,7 +30,7 @@ func NewXPlusObfuscator(key []byte) *XPlusObfuscator {
}
}
func (x *XPlusObfuscator) Deobfuscate(in []byte, out []byte) int {
func (x *XPlusObfuscator) Deobfuscate(in, out []byte) int {
outLen := len(in) - xpSaltLen
if outLen <= 0 || len(out) < outLen {
return 0
@ -42,7 +42,7 @@ func (x *XPlusObfuscator) Deobfuscate(in []byte, out []byte) int {
return outLen
}
func (x *XPlusObfuscator) Obfuscate(in []byte, out []byte) int {
func (x *XPlusObfuscator) Obfuscate(in, out []byte) int {
outLen := len(in) + xpSaltLen
if len(out) < outLen {
return 0

4
core/transport/socks5.go
View file

@ -21,7 +21,7 @@ type SOCKS5Client struct {
Password string
}
func NewSOCKS5Client(serverAddr string, username string, password string) *SOCKS5Client {
func NewSOCKS5Client(serverAddr, username, password string) *SOCKS5Client {
return &SOCKS5Client{
Dialer: &net.Dialer{
Timeout: 8 * time.Second,
@ -215,7 +215,7 @@ func (c *socks5UDPConn) Close() error {
return nil
}
func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, error) {
func socks5AddrToUDPAddr(atyp byte, addr, port []byte) (*net.UDPAddr, error) {
clone := func(b []byte) []byte {
c := make([]byte, len(b))
copy(c, b)