log: show caller's info in verbose mode

common/log/log.go

@@ -1,6 +1,12 @@
 package log
 
-import stdlog "log"
+import (
+	stdlog "log"
+)
+
+func init() {
+	stdlog.SetFlags(stdlog.LstdFlags | stdlog.Lshortfile)
+}
 
 // Func defines a simple log function
 type Func func(f string, v ...interface{})

main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	stdlog "log"
 	"os"
 	"os/signal"
@@ -38,7 +39,7 @@ func main() {
 	// setup a log func
 	log.F = func(f string, v ...interface{}) {
 		if conf.Verbose {
-			stdlog.Printf(f, v...)
+			stdlog.Output(2, fmt.Sprintf(f, v...))
 		}
 	}
 

proxy/http/server.go

@@ -61,7 +61,7 @@ func (s *HTTP) Serve(cc net.Conn) {
 
 	if s.pretend {
 		fmt.Fprintf(c, "%s 404 Not Found\r\nServer: nginx\r\n\r\n404 Not Found\r\n", req.proto)
-		log.F("[http] accessed by %s as web server", c.RemoteAddr().String())
+		log.F("[http] %s <-> %s,pretend as web server", c.RemoteAddr().String(), s.Addr())
 		return
 	}
 

proxy/tcptun/tcptun.go

@@ -1,6 +1,7 @@
 package tcptun
 
 import (
+	"errors"
 	"net"
 	"net/url"
 	"strings"
@@ -26,12 +27,15 @@ func init() {
 func NewTCPTun(s string, p proxy.Proxy) (*TCPTun, error) {
 	u, err := url.Parse(s)
 	if err != nil {
-		log.F("parse err: %s", err)
+		log.F("[tcptun] parse err: %s", err)
 		return nil, err
 	}
 
 	addr := u.Host
 	d := strings.Split(addr, "=")
+	if len(d) < 2 {
+		return nil, errors.New("error in strings.Split")
+	}
 
 	t := &TCPTun{
 		proxy: p,

proxy/udptun/udptun.go

@@ -1,6 +1,7 @@
 package udptun
 
 import (
+	"errors"
 	"net"
 	"net/url"
 	"strings"
@@ -34,6 +35,9 @@ func NewUDPTun(s string, p proxy.Proxy) (*UDPTun, error) {
 
 	addr := u.Host
 	d := strings.Split(addr, "=")
+	if len(d) < 2 {
+		return nil, errors.New("error in strings.Split")
+	}
 
 	ut := &UDPTun{
 		proxy: p,

proxy/uottun/uottun.go

@@ -1,6 +1,7 @@
 package uottun
 
 import (
+	"errors"
 	"io/ioutil"
 	"net"
 	"net/url"
@@ -34,6 +35,9 @@ func NewUoTTun(s string, p proxy.Proxy) (*UoTTun, error) {
 
 	addr := u.Host
 	d := strings.Split(addr, "=")
+	if len(d) < 2 {
+		return nil, errors.New("error in strings.Split")
+	}
 
 	ut := &UoTTun{
 		proxy: p,