mirror
/
gost-mirror
mirror of https://github.com/ginuerzh/gost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

use new logger

2.11-dev
ginuerzh 6 years ago
parent
97ff9b846b
commit
fd0d28e815
37 changed files with 53 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      chain.go
  2. 9
      cmd/gost/main.go
  3. 2
      cmd/gost/route.go
  4. 2
      common_test.go
  5. 2
      dns.go
  6. 2
      forward.go
  7. 2
      ftcp.go
  8. 2
      go.mod
  9. 16
      go.sum
  10. 2
      gost.go
  11. 2
      handler.go
  12. 2
      hosts.go
  13. 2
      http.go
  14. 2
      http2.go
  15. 2
      kcp.go
  16. 36
      log.go
  17. 2
      obfs.go
  18. 2
      quic.go
  19. 2
      redirect.go
  20. 2
      redirect_other.go
  21. 2
      relay.go
  22. 2
      reload.go
  23. 2
      resolver.go
  24. 2
      server.go
  25. 2
      signal_unix.go
  26. 2
      sni.go
  27. 2
      socks.go
  28. 2
      ss.go
  29. 2
      ssh.go
  30. 2
      tls.go
  31. 2
      tuntap.go
  32. 2
      tuntap_darwin.go
  33. 2
      tuntap_linux.go
  34. 2
      tuntap_unix.go
  35. 2
      tuntap_windows.go
  36. 2
      udp.go
  37. 2
      ws.go

2
chain.go
View File

@ -6,7 +6,7 @@ import (
"net"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
var (

9
cmd/gost/main.go
View File

@ -5,14 +5,14 @@ import (
"errors"
"flag"
"fmt"
stdlog "log"
"net/http"
_ "net/http/pprof"
"os"
"runtime"
_ "net/http/pprof"
"github.com/ginuerzh/gost"
"github.com/go-log/log"
"github.com/go-gost/log"
)
var (
@ -23,7 +23,8 @@ var (
)
func init() {
gost.SetLogger(&gost.LogLogger{})
stdlog.SetFlags(stdlog.LstdFlags | stdlog.Lshortfile)
gost.SetLogger(&log.StdLogger{})
var (
printVersion bool

2
cmd/gost/route.go
View File

@ -11,7 +11,7 @@ import (
"strings"
"github.com/ginuerzh/gost"
"github.com/go-log/log"
"github.com/go-gost/log"
)
type stringList []string

2
common_test.go
View File

@ -14,7 +14,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
func init() {

2
dns.go
View File

@ -15,7 +15,7 @@ import (
"time"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/miekg/dns"
)

2
forward.go
View File

@ -11,7 +11,7 @@ import (
"fmt"
"github.com/ginuerzh/gosocks5"
"github.com/go-log/log"
"github.com/go-gost/log"
smux "gopkg.in/xtaci/smux.v1"
)

2
ftcp.go
View File

@ -5,7 +5,7 @@ import (
"net"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/xtaci/tcpraw"
)

2
go.mod
View File

@ -16,8 +16,8 @@ require (
github.com/ginuerzh/gosocks5 v0.2.0
github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796
github.com/go-gost/bpool v1.0.0
github.com/go-gost/log v1.0.0
github.com/go-gost/relay v0.1.0
github.com/go-log/log v0.1.0
github.com/gobwas/glob v0.2.3
github.com/golang/mock v1.2.0 // indirect
github.com/google/gopacket v1.1.17 // indirect

16
go.sum
View File

@ -21,6 +21,7 @@ github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4=
github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
github.com/docker/libcontainer v2.2.1+incompatible h1:++SbbkCw+X8vAd4j2gOCzZ2Nn7s2xFALTf7LZKmM1/0=
github.com/docker/libcontainer v2.2.1+incompatible/go.mod h1:osvj61pYsqhNCMLGX31xr7klUBhHb/ZBuXS0o1Fvwbw=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/ginuerzh/gosocks4 v0.0.1 h1:ojDKUyz+uaEeRm2usY1cyQiXTqJqrKxfeE6SVBXq4m0=
github.com/ginuerzh/gosocks4 v0.0.1/go.mod h1:8SdwBMKjfJ9+BfP2vDJM1jcrgWUbWV6qxBPHHVrwptY=
@ -30,19 +31,23 @@ github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796 h1:VPXbYR
github.com/ginuerzh/tls-dissector v0.0.2-0.20200224064855-24ab2b3a3796/go.mod h1:YyzP8PQrGwDH/XsfHJXwqdHLwWvBYxu77YVKm0+68f0=
github.com/go-gost/bpool v1.0.0 h1:Og+6SH6SooHqf8CIwuxcPRHq8k0Si4YEfO2mBEi3/Uk=
github.com/go-gost/bpool v1.0.0/go.mod h1:y/Pywm22A4OrJqNF/mL4nW7yb9fCdhlO8cxjyparkFI=
github.com/go-gost/log v1.0.0 h1:maSjjMvQqLSQYb0Ta5nJTdlRI+aiLMt6WIBYVxajJgs=
github.com/go-gost/log v1.0.0/go.mod h1:FCOaaJQ7moHTlLxYk7dsFewlS68U9A1GG3OR+yXkF6s=
github.com/go-gost/relay v0.1.0 h1:UOf2YwAzzaUjY5mdpMuLfSw0vz62iIFYk7oJQkuhlGw=
github.com/go-gost/relay v0.1.0/go.mod h1:YFCpddLOFE3NlIkeDWRdEs8gL/GFsqXdtaf8SV5v4YQ=
github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U=
github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/klauspost/compress v1.4.1 h1:8VMb5+0wMgdBykOV96DwNwKFQ+WTI4pzYURP99CcB9E=
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
@ -63,7 +68,9 @@ github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7
github.com/milosgajdos83/tenus v0.0.0-20190415114537-1f3ed00ae7d8 h1:4WFQEfEJ7zaHYViIVM2Cd6tnQOOhiEHbmQtlcV7aOpc=
github.com/milosgajdos83/tenus v0.0.0-20190415114537-1f3ed00ae7d8/go.mod h1:G95Wwn625/q6JCCytI4VR/a5VtPwrtI0B+Q1Gi38QLA=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@ -97,6 +104,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -108,13 +116,17 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/gorilla/websocket.v1 v1.4.0 h1:lREme3ezAGPCpxSHwjGkHhAJX+ed2B6vzAJ+kaqBEIM=
gopkg.in/gorilla/websocket.v1 v1.4.0/go.mod h1:Ons1i8d00TjvJPdla7bJyeXFsdOacUyrTYbg9IetsIE=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/xtaci/kcp-go.v4 v4.3.2 h1:S9IF+L55Ugzl/hVA6wvuL3SuAtTUzH2cBBC88MXQxnE=
gopkg.in/xtaci/kcp-go.v4 v4.3.2/go.mod h1:fFYTlSOHNOHDNTKfoqarZMQsu7g7oXKwJ9wq0i9lODc=
gopkg.in/xtaci/smux.v1 v1.0.7 h1:qootIZs4ZPSx5blhvgaFpx2epdFSWkyw99xT+q0mRXI=
gopkg.in/xtaci/smux.v1 v1.0.7/go.mod h1:NbrPjLp8lNAYN8KqTplnFr2JjIBbr7CdHBkHtHsXtWA=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

2
gost.go
View File

@ -15,7 +15,7 @@ import (
"strings"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// Version is the gost version.

2
handler.go
View File

@ -9,7 +9,7 @@ import (
"github.com/ginuerzh/gosocks4"
"github.com/ginuerzh/gosocks5"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// Handler is a proxy server handler

2
hosts.go
View File

@ -7,7 +7,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// Host is a static mapping from hostname to IP.

2
http.go
View File

@ -15,7 +15,7 @@ import (
"strings"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
type httpConnector struct {

2
http2.go
View File

@ -20,7 +20,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
"golang.org/x/net/http2"
)

2
kcp.go
View File

@ -13,7 +13,7 @@ import (
"sync"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/klauspost/compress/snappy"
"github.com/xtaci/tcpraw"
"gopkg.in/xtaci/kcp-go.v4"

36
log.go
View File

@ -1,36 +0,0 @@
package gost
import (
"fmt"
"log"
)
func init() {
log.SetFlags(log.LstdFlags | log.Lshortfile)
}
// LogLogger uses the standard log package as the logger
type LogLogger struct {
}
// Log uses the standard log library log.Output
func (l *LogLogger) Log(v ...interface{}) {
log.Output(3, fmt.Sprintln(v...))
}
// Logf uses the standard log library log.Output
func (l *LogLogger) Logf(format string, v ...interface{}) {
log.Output(3, fmt.Sprintf(format, v...))
}
// NopLogger is a dummy logger that discards the log outputs
type NopLogger struct {
}
// Log does nothing
func (l *NopLogger) Log(v ...interface{}) {
}
// Logf does nothing
func (l *NopLogger) Logf(format string, v ...interface{}) {
}

2
obfs.go
View File

@ -17,7 +17,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
pt "git.torproject.org/pluggable-transports/goptlib.git"
"git.torproject.org/pluggable-transports/obfs4.git/transports/base"

2
quic.go
View File

@ -11,7 +11,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
quic "github.com/lucas-clemente/quic-go"
)

2
redirect.go
View File

@ -12,7 +12,7 @@ import (
"time"
"github.com/LiamHaworth/go-tproxy"
"github.com/go-log/log"
"github.com/go-gost/log"
)
type tcpRedirectHandler struct {

2
redirect_other.go
View File

@ -6,7 +6,7 @@ import (
"errors"
"net"
"github.com/go-log/log"
"github.com/go-gost/log"
)
type tcpRedirectHandler struct {

2
relay.go
View File

@ -14,8 +14,8 @@ import (
"time"
"github.com/go-gost/bpool"
"github.com/go-gost/log"
"github.com/go-gost/relay"
"github.com/go-log/log"
)
type relayConnector struct {

2
reload.go
View File

@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// Reloader is the interface for objects that support live reloading.

2
resolver.go
View File

@ -16,7 +16,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/miekg/dns"
)

2
server.go
View File

@ -6,7 +6,7 @@ import (
"time"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// Accepter represents a network endpoint that can accept connection from peer.

2
signal_unix.go
View File

@ -7,7 +7,7 @@ import (
"os/signal"
"syscall"
"github.com/go-log/log"
"github.com/go-gost/log"
"gopkg.in/xtaci/kcp-go.v4"
)

2
sni.go
View File

@ -18,7 +18,7 @@ import (
"sync"
dissector "github.com/ginuerzh/tls-dissector"
"github.com/go-log/log"
"github.com/go-gost/log"
)
type sniConnector struct {

2
socks.go
View File

@ -16,7 +16,7 @@ import (
"github.com/ginuerzh/gosocks4"
"github.com/ginuerzh/gosocks5"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
smux "gopkg.in/xtaci/smux.v1"
)

2
ss.go
View File

@ -12,7 +12,7 @@ import (
"github.com/ginuerzh/gosocks5"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/shadowsocks/go-shadowsocks2/core"
ss "github.com/shadowsocks/shadowsocks-go/shadowsocks"
)

2
ssh.go
View File

@ -13,7 +13,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
"golang.org/x/crypto/ssh"
)

2
tls.go
View File

@ -8,7 +8,7 @@ import (
"sync"
"time"
"github.com/go-log/log"
"github.com/go-gost/log"
smux "gopkg.in/xtaci/smux.v1"
)

2
tuntap.go
View File

@ -11,7 +11,7 @@ import (
"time"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/shadowsocks/go-shadowsocks2/core"
"github.com/shadowsocks/go-shadowsocks2/shadowaead"
"github.com/songgao/water"

2
tuntap_darwin.go
View File

@ -7,7 +7,7 @@ import (
"os/exec"
"strings"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/songgao/water"
)

2
tuntap_linux.go
View File

@ -5,7 +5,7 @@ import (
"net"
"github.com/docker/libcontainer/netlink"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/milosgajdos83/tenus"
"github.com/songgao/water"
)

2
tuntap_unix.go
View File

@ -8,7 +8,7 @@ import (
"os/exec"
"strings"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/songgao/water"
)

2
tuntap_windows.go
View File

@ -6,7 +6,7 @@ import (
"os/exec"
"strings"
"github.com/go-log/log"
"github.com/go-gost/log"
"github.com/songgao/water"
)

2
udp.go
View File

@ -8,7 +8,7 @@ import (
"time"
"github.com/go-gost/bpool"
"github.com/go-log/log"
"github.com/go-gost/log"
)
// udpTransporter is a raw UDP transporter.

2
ws.go
View File

@ -14,7 +14,7 @@ import (
"net/url"
"github.com/go-log/log"
"github.com/go-gost/log"
"gopkg.in/gorilla/websocket.v1"
smux "gopkg.in/xtaci/smux.v1"
)

Write Preview
Loading…
Cancel
Save