github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix assert fail

pull/238/head
Shelikhoo 2016-08-15 21:19:15 +08:00
parent 4b9e506dba
commit 856f2a2dd3
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transport/internet/ws/stopablehttplistener.go
View File

@ -3,23 +3,23 @@ package ws
import ( import (
"errors" "errors"
"net" "net"
"time"
) )
type StoppableListener struct { type StoppableListener struct {
*net.TCPListener //Wrapped listener net.Listener //Wrapped listener
stop chan int //Channel used only to indicate listener should shutdown stop chan int //Channel used only to indicate listener should shutdown
} }
func NewStoppableListener(l net.Listener) (*StoppableListener, error) { func NewStoppableListener(l net.Listener) (*StoppableListener, error) {
/*
tcpL, ok := l.(*net.TCPListener) tcpL, ok := l.(*net.TCPListener)
if !ok { if !ok {
return nil, errors.New("Cannot wrap listener") return nil, errors.New("Cannot wrap listener")
} }
*/
retval := &StoppableListener{} retval := &StoppableListener{}
retval.TCPListener = tcpL retval.Listener = l
retval.stop = make(chan int) retval.stop = make(chan int)
return retval, nil return retval, nil
@ -30,10 +30,7 @@ var StoppedError = errors.New("Listener stopped")
func (sl *StoppableListener) Accept() (net.Conn, error) { func (sl *StoppableListener) Accept() (net.Conn, error) {
for { for {
//Wait up to one second for a new connection newConn, err := sl.Listener.Accept()
sl.SetDeadline(time.Now().Add(time.Second))
newConn, err := sl.TCPListener.Accept()
//Check for the channel being closed //Check for the channel being closed
select { select {