prepare for v0.0.16

daemon/deamon.go

@@ -36,7 +36,7 @@ func (o *DaemonOption) Handle() error {
 	}
 	cmd := exec.Command(os.Args[0], args...)
 	cmd.Start()
-	fmt.Println("Trojan-Go is running in the background")
+	fmt.Println("Trojan-Go is running in the background...")
 	fmt.Println("[PID]", cmd.Process.Pid)
 	os.Exit(0)
 	return nil

main.go

@@ -7,6 +7,8 @@ import (
 	"github.com/p4gefau1t/trojan-go/common"
 	"github.com/p4gefau1t/trojan-go/log"
 
+	//the following modules are optional
+	//you can comment some of them if you don't need them
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/p4gefau1t/trojan-go/cert"
 	_ "github.com/p4gefau1t/trojan-go/daemon"

proxy/client/client.go

@@ -48,7 +48,7 @@ func (c *Client) listenUDP() {
 		})
 		if err != nil {
 			logger.Error(common.NewError("failed to listen udp").Base(err))
-			time.Sleep(time.Second * 5)
+			time.Sleep(protocol.UDPTimeout)
 			continue
 		}
 		inbound, err := socks.NewInboundPacketSession(listener)
@@ -75,7 +75,7 @@ func (c *Client) listenUDP() {
 				logger.Debug("keep alive..(alive)")
 			case <-c.associatedChan:
 				logger.Debug("keep alive..(associated)")
-			case <-time.After(protocol.UDPTimeout):
+			case <-time.After(protocol.UDPTimeout * 5):
 				logger.Debug("time out, closing UDP tunnel")
 				outbound.Close()
 				inbound.Close()

proxy/server/server.go

@@ -114,15 +114,15 @@ func (s *Server) handleConn(conn net.Conn) {
 func (s *Server) handleInvalidConn(conn net.Conn, tlsConn *tls.Conn) {
 	defer conn.Close()
 	if len(s.config.TLS.HTTPResponse) > 0 {
-		logger.Warn("trying to response a plain http response")
+		logger.Warn("trying to response with a plain http response")
 		conn.Write(s.config.TLS.HTTPResponse)
 		return
 	}
 
 	if s.config.TLS.FallbackAddr != nil {
 		defer func() {
 			if r := recover(); r != nil {
-				logger.Error("Recovered", r)
+				logger.Error("recovered", r)
 			}
 		}()
 		//HACK