Change v functions

Author: coyove

client.go

@@ -72,7 +72,7 @@ func NewClient(localaddr string, config *ClientConfig) error {
 			if config.Dynamic {
 				dst, err := handleSOCKS5(downconn)
 				if err != nil {
-					v.Vprint("SOCKS5 server error: ", err)
+					v.Eprint("SOCKS5 server error: ", err)
 					return
 				}
 				bind = dst
@@ -86,20 +86,20 @@ func NewClient(localaddr string, config *ClientConfig) error {
 			}
 
 			if err != nil {
-				v.Vprint("dial server: ", err)
+				v.Eprint("dial server: ", err)
 				return
 			}
 			defer up.Close()
 
 			upconn := toh.NewBufConn(up)
 			if _, err := upconn.Write([]byte(bind + "\n")); err != nil {
-				v.Vprint("failed to req: ", err)
+				v.Eprint("failed to req: ", err)
 				return
 			}
 
 			resp, err := upconn.ReadBytes('\n')
 			if err != nil || string(resp) != "OK\n" {
-				v.Vprint("server failed to ack: ", err, ", resp: ", string(resp))
+				v.Eprint("server failed to ack: ", err, ", resp: ", string(resp))
 				return
 			}
 
@@ -152,6 +152,7 @@ func handleSOCKS5(conn net.Conn) (string, error) {
 	case 0x04:
 		addrsize = net.IPv6len + 2
 	case 0x03:
+		// read one extra byte that indicates the length of the domain
 		if _, err := io.ReadFull(conn, buf[:1]); err != nil {
 			return "", fmt.Errorf("failed to read domain destination: %v", err)
 		}

cmd/goflyway/main.go

@@ -27,7 +27,7 @@ func printHelp(a ...interface{}) {
 		fmt.Printf("goflyway: ")
 		fmt.Println(a...)
 	}
-	fmt.Println("usage: goflyway -LhuUvVkKpPtTwW address:port")
+	fmt.Println("usage: goflyway -DLhuUvVkKqpPtTwW address:port")
 	os.Exit(0)
 }
 
@@ -47,6 +47,8 @@ func main() {
 					last = c
 				case 'v':
 					v.Verbose++
+				case 'q':
+					v.Verbose = -1
 				case 'w':
 					cconfig.WebSocket = true
 				case 'K':
@@ -111,7 +113,12 @@ func main() {
 	}
 
 	if addr == "" {
-		printHelp("missing address:port")
+		if localAddr == "" {
+			v.Vprint("assume you want a default server at :8100")
+			addr = ":8100"
+		} else {
+			printHelp("missing address:port to listen/connect")
+		}
 	}
 
 	if localAddr != "" && remoteAddr == "" {
@@ -150,18 +157,22 @@ func main() {
 			}
 		}()
 
-		fmt.Println("goflyway client binds", remoteAddr, "at", addr, "to", localAddr, with)
+		if cconfig.Dynamic {
+			v.Vprint("forward dynamically (SOCKS5) at local:", localAddr, "to remote:", addr, with)
+		} else {
+			v.Vprint("bind", remoteAddr, "at remote:", addr, "to local:", localAddr, with)
+		}
 
 		if a := os.Getenv("http_proxy") + os.Getenv("HTTP_PROXY"); a != "" {
-			fmt.Println("note: system HTTP proxy is set to:", a)
+			v.Vprint("note: system HTTP proxy is set to:", a)
 		}
 		if a := os.Getenv("https_proxy") + os.Getenv("HTTPS_PROXY"); a != "" {
-			fmt.Println("note: system HTTPS proxy is set to:", a)
+			v.Vprint("note: system HTTPS proxy is set to:", a)
 		}
 
-		panic(goflyway.NewClient(localAddr, cconfig))
+		v.Eprint(goflyway.NewClient(localAddr, cconfig))
 	} else {
-		fmt.Println("goflyway server listens on", addr, with)
-		panic(goflyway.NewServer(addr, sconfig))
+		v.Vprint("server listens on", addr, with)
+		v.Eprint(goflyway.NewServer(addr, sconfig))
 	}
 }

io.go

@@ -11,14 +11,14 @@ import (
 func Bridge(target, source net.Conn, timeout *TokenBucket, stat *Traffic) {
 	go func() {
 		if err := ioCopy(target, source, timeout, stat.Sent()); err != nil {
-			Vprint("Bridge: ", err)
+			Eprint("bridge: ", err)
 		}
 		target.Close()
 		source.Close()
 	}()
 
 	if err := ioCopy(source, target, timeout, stat.Recv()); err != nil {
-		Vprint("Bridge: ", err)
+		Eprint("bridge: ", err)
 	}
 
 	// Multiple closes, but for tohConn they are just fine

toh/client_conn.go

@@ -123,7 +123,7 @@ REWRITE:
 	}
 
 	if len(c.write.buf) > c.dialer.MaxWriteBuffer {
-		v.Vprint(c, " write buffer is full")
+		v.Eprint(c, " write buffer is full")
 		time.Sleep(time.Second)
 		goto REWRITE
 	}

toh/frame.go

@@ -69,7 +69,7 @@ func parseframe(r io.ReadCloser, blk cipher.Block) (f frame, ok bool) {
 		if err == io.EOF {
 			ok = true
 		} else {
-			v.Vprint(err)
+			v.Eprint(err)
 		}
 		return
 	}
@@ -86,14 +86,14 @@ func parseframe(r io.ReadCloser, blk cipher.Block) (f frame, ok bool) {
 	datalen := int(binary.LittleEndian.Uint32(header[12:]))
 	data := make([]byte, datalen)
 	if n, err := io.ReadAtLeast(r, data, datalen); err != nil || n != datalen {
-		v.Vprint(err)
+		v.Eprint(err)
 		return
 	}
 
 	gcm, err := cipher.NewGCM(blk)
 	data, err = gcm.Open(nil, header[:12], data, nil)
 	if err != nil {
-		v.Vprint(err)
+		v.Eprint(err)
 		return
 	}
 

toh/orch.go

@@ -85,7 +85,7 @@ func (d *Dialer) startOrch() {
 			go func(pingframe frame, lastconn *ClientConn, conns map[uint64]*ClientConn) {
 				resp, err := lastconn.send(pingframe)
 				if err != nil {
-					v.Vprint("send error: ", err)
+					v.Eprint("send error: ", err)
 					return
 				}
 				defer resp.Body.Close()

toh/server_conn.go

@@ -66,7 +66,7 @@ func (l *Listener) handler(w http.ResponseWriter, r *http.Request) {
 		conn, err := l.wsHandShake(w, r)
 		if err != nil {
 			w.WriteHeader(http.StatusBadRequest)
-			v.Vprint("websocket handshake error: ", err)
+			v.Eprint("websocket handshake error: ", err)
 		} else {
 			l.pendingConns <- conn
 		}
@@ -149,7 +149,7 @@ func (l *Listener) handler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if datalen, err := conn.read.feedframes(r.Body); err != nil {
-		v.Vprint("listener feed frames, error: ", err, ", ", conn, " will be deleted")
+		v.Eprint("listener feed frames, error: ", err, ", ", conn, " will be deleted")
 		conn.Close()
 		return
 	} else if datalen == 0 && len(conn.write.buf) == 0 {
@@ -203,7 +203,7 @@ func (conn *ServerConn) writeTo(w io.Writer) {
 			if time.Now().Before(deadline) {
 				goto AGAIN
 			}
-			v.Vprint(conn, " failed to response, error: ", err)
+			v.Eprint(conn, " failed to response, error: ", err)
 			conn.read.feedError(err)
 			conn.Close()
 			return

v/vprint.go

@@ -19,6 +19,8 @@ var (
 	FloatPrec  = 3
 )
 
+func Eprint(v ...interface{}) { vprint(0, v...) }
+
 func Vprint(v ...interface{}) { vprint(1, v...) }
 
 func VVprint(v ...interface{}) { vprint(2, v...) }
@@ -74,9 +76,18 @@ func vprint(b int, v ...interface{}) {
 		}
 	}
 
-	_, fn, line, _ := runtime.Caller(2)
-	str, now := fmt.Sprint(v...), time.Now()
-	fmt.Fprintf(os.Stdout, "dbg%d %s%02d %02d:%02d:%02d %s:%-3d ] %s\n", b,
+	var (
+		_, fn, line, _ = runtime.Caller(2)
+		str            = strings.TrimRightFunc(fmt.Sprint(v...), func(r rune) bool { return r == '\r' || r == '\n' })
+		now            = time.Now()
+		lead           = "dbg" + strconv.Itoa(b)
+	)
+
+	if b == 0 {
+		lead = "error"
+	}
+
+	fmt.Fprintf(os.Stdout, lead+" %s%02d %02d:%02d:%02d %s:%-3d ] %s\n",
 		"123456789OXZ"[now.Month()-1:now.Month()], now.Day(), now.Hour(), now.Minute(), now.Second(),
 		filepath.Base(fn), line, str)
 }