diff --git a/cmd/gost/vendor/github.com/ginuerzh/gost/kcp.go b/cmd/gost/vendor/github.com/ginuerzh/gost/kcp.go index 57085c7..1980942 100644 --- a/cmd/gost/vendor/github.com/ginuerzh/gost/kcp.go +++ b/cmd/gost/vendor/github.com/ginuerzh/gost/kcp.go @@ -14,8 +14,6 @@ import ( "gopkg.in/xtaci/smux.v1" "net" "os" - "os/signal" - "syscall" "time" ) @@ -250,18 +248,6 @@ func snmpLogger(path string, interval int) { } } -func kcpSigHandler() { - ch := make(chan os.Signal, 1) - signal.Notify(ch, syscall.SIGUSR1) - - for { - switch <-ch { - case syscall.SIGUSR1: - glog.V(LINFO).Infof("[kcp] SNMP: %+v", kcp.DefaultSnmp.Copy()) - } - } -} - type KCPSession struct { conn net.Conn session *smux.Session diff --git a/cmd/gost/vendor/github.com/ginuerzh/gost/signal.go b/cmd/gost/vendor/github.com/ginuerzh/gost/signal.go new file mode 100644 index 0000000..f12e902 --- /dev/null +++ b/cmd/gost/vendor/github.com/ginuerzh/gost/signal.go @@ -0,0 +1,5 @@ +// +build windows + +package gost + +func kcpSigHandler() {} diff --git a/cmd/gost/vendor/github.com/ginuerzh/gost/signal_unix.go b/cmd/gost/vendor/github.com/ginuerzh/gost/signal_unix.go new file mode 100644 index 0000000..f46b394 --- /dev/null +++ b/cmd/gost/vendor/github.com/ginuerzh/gost/signal_unix.go @@ -0,0 +1,23 @@ +// +build !windows + +package gost + +import ( + "github.com/golang/glog" + "gopkg.in/xtaci/kcp-go.v2" + "os" + "os/signal" + "syscall" +) + +func kcpSigHandler() { + ch := make(chan os.Signal, 1) + signal.Notify(ch, syscall.SIGUSR1) + + for { + switch <-ch { + case syscall.SIGUSR1: + glog.V(LINFO).Infof("[kcp] SNMP: %+v", kcp.DefaultSnmp.Copy()) + } + } +} diff --git a/cmd/gost/vendor/vendor.json b/cmd/gost/vendor/vendor.json index 043e68e..8d80d1a 100644 --- a/cmd/gost/vendor/vendor.json +++ b/cmd/gost/vendor/vendor.json @@ -21,10 +21,10 @@ "revisionTime": "2017-01-19T05:34:58Z" }, { - "checksumSHA1": "FiAXa5vUbpoqK2lhegpc9lOpumk=", + "checksumSHA1": "90Nj9KD5KzY15ZBn95Coz7G85+0=", "path": "github.com/ginuerzh/gost", - "revision": "d98860877d6952f26974ebaa044b29af05528f46", - "revisionTime": "2017-03-03T07:45:56Z" + "revision": "26f4e49f0538177eb5ec33c84a280afe2ae16042", + "revisionTime": "2017-03-03T13:33:05Z" }, { "checksumSHA1": "+XIOnTW0rv8Kr/amkXgMraNeUr4=", diff --git a/kcp.go b/kcp.go index 57085c7..1980942 100644 --- a/kcp.go +++ b/kcp.go @@ -14,8 +14,6 @@ import ( "gopkg.in/xtaci/smux.v1" "net" "os" - "os/signal" - "syscall" "time" ) @@ -250,18 +248,6 @@ func snmpLogger(path string, interval int) { } } -func kcpSigHandler() { - ch := make(chan os.Signal, 1) - signal.Notify(ch, syscall.SIGUSR1) - - for { - switch <-ch { - case syscall.SIGUSR1: - glog.V(LINFO).Infof("[kcp] SNMP: %+v", kcp.DefaultSnmp.Copy()) - } - } -} - type KCPSession struct { conn net.Conn session *smux.Session diff --git a/signal.go b/signal.go new file mode 100644 index 0000000..f12e902 --- /dev/null +++ b/signal.go @@ -0,0 +1,5 @@ +// +build windows + +package gost + +func kcpSigHandler() {} diff --git a/signal_unix.go b/signal_unix.go new file mode 100644 index 0000000..f46b394 --- /dev/null +++ b/signal_unix.go @@ -0,0 +1,23 @@ +// +build !windows + +package gost + +import ( + "github.com/golang/glog" + "gopkg.in/xtaci/kcp-go.v2" + "os" + "os/signal" + "syscall" +) + +func kcpSigHandler() { + ch := make(chan os.Signal, 1) + signal.Notify(ch, syscall.SIGUSR1) + + for { + switch <-ch { + case syscall.SIGUSR1: + glog.V(LINFO).Infof("[kcp] SNMP: %+v", kcp.DefaultSnmp.Copy()) + } + } +}