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

chore: reformat code

Browse source
This commit is contained in:
Haruue Icymoon 2023-11-27 11:34:54 +08:00
parent e70838cd98
commit 9476976950
No known key found for this signature in database
GPG key ID: F6083B28CBCBC148
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/cmd/client.go
View file

@ -5,13 +5,14 @@ import (
"crypto/x509" "crypto/x509"
"encoding/hex" "encoding/hex"
"errors" "errors"
"github.com/apernet/hysteria/extras/correctnet"
"net" "net"
"os" "os"
"strconv" "strconv"
"strings" "strings"
"time" "time"
"github.com/apernet/hysteria/extras/correctnet"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"go.uber.org/zap" "go.uber.org/zap"

3
app/cmd/server.go
View file

@ -6,7 +6,6 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/apernet/hysteria/extras/correctnet"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -15,6 +14,8 @@ import (
"strings" "strings"
"time" "time"
"github.com/apernet/hysteria/extras/correctnet"
"github.com/caddyserver/certmagic" "github.com/caddyserver/certmagic"
"github.com/mholt/acmez/acme" "github.com/mholt/acmez/acme"
"github.com/spf13/cobra" "github.com/spf13/cobra"

6
extras/correctnet/correctnet.go
View file

@ -38,7 +38,7 @@ func ipAddrNetwork(addr *net.IPAddr) (network string) {
return "ip" + extractIPFamily(addr.IP) return "ip" + extractIPFamily(addr.IP)
} }
func Listen(network string, address string) (net.Listener, error) { func Listen(network, address string) (net.Listener, error) {
if network == "tcp" { if network == "tcp" {
tcpAddr, err := net.ResolveTCPAddr(network, address) tcpAddr, err := net.ResolveTCPAddr(network, address)
if err != nil { if err != nil {
@ -56,7 +56,7 @@ func ListenTCP(network string, laddr *net.TCPAddr) (*net.TCPListener, error) {
return net.ListenTCP(network, laddr) return net.ListenTCP(network, laddr)
} }
func ListenPacket(network string, address string) (listener net.PacketConn, err error) { func ListenPacket(network, address string) (listener net.PacketConn, err error) {
if network == "udp" { if network == "udp" {
udpAddr, err := net.ResolveUDPAddr(network, address) udpAddr, err := net.ResolveUDPAddr(network, address)
if err != nil { if err != nil {
@ -82,7 +82,7 @@ func ListenUDP(network string, laddr *net.UDPAddr) (*net.UDPConn, error) {
return net.ListenUDP(network, laddr) return net.ListenUDP(network, laddr)
} }
func HTTPListenAndServe(address string, handler http.Handler) (err error) { func HTTPListenAndServe(address string, handler http.Handler) error {
listener, err := Listen("tcp", address) listener, err := Listen("tcp", address)
if err != nil { if err != nil {
return err return err

3
extras/masq/server.go
View file

@ -4,9 +4,10 @@ import (
"bufio" "bufio"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"github.com/apernet/hysteria/extras/correctnet"
"net" "net"
"net/http" "net/http"
"github.com/apernet/hysteria/extras/correctnet"
) )
// MasqTCPServer covers the TCP parts of a standard web server (TCP based HTTP/HTTPS). // MasqTCPServer covers the TCP parts of a standard web server (TCP based HTTP/HTTPS).