add pac support and ready to add config file

cmd/client/client.go

@@ -53,7 +53,7 @@ func printHelp() {
                     'rc4-md5-6', 'chacha20', 'chacha20-ietf'], default is 'aes-256-cfb'
   -P, --password    password of server
   -V, --verbose     output detail info
-  -l, --logs        output detail info to logs file
+  -l, --log        output detail info to log file
   -H, --help        show detail usage
 
 Mail bug reports and suggestions to <asche910@gmail.com>

cmd/server/server.go

@@ -53,7 +53,7 @@ func printHelp() {
                     'rc4-md5-6', 'chacha20', 'chacha20-ietf'], default is 'aes-256-cfb'
   -P, --password    password for client connecting
   -V, --verbose     output detail info
-  -l, --logs        output detail info to logs file
+  -l, --log         output detail info to log file
   -H, --help        show detail usage
 
 Mail bug reports and suggestions to <asche910@gmail.com>

fly/pac.go

@@ -1,3 +1,29 @@
 package fly
 
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+)
 
+func StartPAC() {
+	http.HandleFunc("/flynet.pac", func (w http.ResponseWriter, r *http.Request){
+		// the pac file should be placed at the same dir with current running file.
+		// but it is placed at the parent dir when development
+		file, err := os.Open(`flynet.pac`)
+		if err != nil {
+			fmt.Println(err)
+			// run from cmd/client/
+			file, _ = os.Open("../../flynet.pac")
+		}
+		w.Header().Set("Content-Type", "application/x-ns-proxy-autoconfig")
+		io.Copy(w, file)
+		w.WriteHeader(200)
+
+	})
+	err := http.ListenAndServe(":8080", nil)
+	if err != nil {
+		fmt.Println("start failed --->", err)
+	}
+}

fly/pac_test.go

@@ -0,0 +1,7 @@
+package fly
+
+import "testing"
+
+func TestStartPAC(t *testing.T) {
+	StartPAC()
+}

fly/relay.go

@@ -3,6 +3,7 @@ package fly
 import (
 	"fmt"
 	"github.com/xtaci/kcp-go"
+	"io"
 	"net"
 )
 
@@ -45,7 +46,9 @@ func RelayTraffic(dst, src net.Conn) {
 	for {
 		n, err := src.Read(buff)
 		if err != nil {
-			fmt.Println(err)
+			if err != io.EOF {
+				fmt.Println(err)
+			}
 			break
 		}
 		//logger.Println("Read", n)

fly/socks5.go

@@ -140,7 +140,7 @@ func Socks5ForServerByTCP(localPort, method, key string) {
 
 			host, port := parseSocksRequest(buff[:n], n)
 			//logger.Printf("target server ------\n%s:%s\n------\n%d\n+++++++\n", host, port, buff[:n])
-			logger.Printf("target server ------\n%s:%s\n------\n", host, port)
+			logger.Printf("target server ---> %s:%s <---\n", host, port)
 
 			// dial the target server
 			server, err := net.Dial("tcp", net.JoinHostPort(host, port))

flynet.conf

@@ -0,0 +1,22 @@
+# flynet config file
+#
+# multiple line you can use ``
+#
+
+[server]
+mode = socks-tcp
+port = 8888     # listen port for client to connect
+method = "aes-256-cfb"
+password =
+# verbose = true
+# log = flynet.log
+
+
+[client]
+mode = socks-tcp
+port = 1080 # local socks5 listen port
+serverAddr = example.com:8080 # include host and port
+method = "aes-256-cfb"
+password =
+# verbose = true
+# log = flynet.log