From 9476976950c0a738a9f1701c77a13b4bd67fa6c1 Mon Sep 17 00:00:00 2001
From: Haruue Icymoon <i@haruue.moe>
Date: Mon, 27 Nov 2023 11:34:54 +0800
Subject: [PATCH] chore: reformat code

---
 app/cmd/client.go               | 3 ++-
 app/cmd/server.go               | 3 ++-
 extras/correctnet/correctnet.go | 6 +++---
 extras/masq/server.go           | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/cmd/client.go b/app/cmd/client.go
index 0512867..561439b 100644
--- a/app/cmd/client.go
+++ b/app/cmd/client.go
@@ -5,13 +5,14 @@ import (
 	"crypto/x509"
 	"encoding/hex"
 	"errors"
-	"github.com/apernet/hysteria/extras/correctnet"
 	"net"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/apernet/hysteria/extras/correctnet"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
diff --git a/app/cmd/server.go b/app/cmd/server.go
index 6784065..86c6e31 100644
--- a/app/cmd/server.go
+++ b/app/cmd/server.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/apernet/hysteria/extras/correctnet"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -15,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/apernet/hysteria/extras/correctnet"
+
 	"github.com/caddyserver/certmagic"
 	"github.com/mholt/acmez/acme"
 	"github.com/spf13/cobra"
diff --git a/extras/correctnet/correctnet.go b/extras/correctnet/correctnet.go
index 3ce0681..0609825 100644
--- a/extras/correctnet/correctnet.go
+++ b/extras/correctnet/correctnet.go
@@ -38,7 +38,7 @@ func ipAddrNetwork(addr *net.IPAddr) (network string) {
 	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" {
 		tcpAddr, err := net.ResolveTCPAddr(network, address)
 		if err != nil {
@@ -56,7 +56,7 @@ func ListenTCP(network string, laddr *net.TCPAddr) (*net.TCPListener, error) {
 	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" {
 		udpAddr, err := net.ResolveUDPAddr(network, address)
 		if err != nil {
@@ -82,7 +82,7 @@ func ListenUDP(network string, laddr *net.UDPAddr) (*net.UDPConn, error) {
 	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)
 	if err != nil {
 		return err
diff --git a/extras/masq/server.go b/extras/masq/server.go
index 91b4334..3acb177 100644
--- a/extras/masq/server.go
+++ b/extras/masq/server.go
@@ -4,9 +4,10 @@ import (
 	"bufio"
 	"crypto/tls"
 	"fmt"
-	"github.com/apernet/hysteria/extras/correctnet"
 	"net"
 	"net/http"
+
+	"github.com/apernet/hysteria/extras/correctnet"
 )
 
 // MasqTCPServer covers the TCP parts of a standard web server (TCP based HTTP/HTTPS).