mirror of https://github.com/v2ray/v2ray-core
Fix assert fail
parent
4b9e506dba
commit
856f2a2dd3
|
@ -3,23 +3,23 @@ package ws
|
|||
import (
|
||||
"errors"
|
||||
"net"
|
||||
"time"
|
||||
)
|
||||
|
||||
type StoppableListener struct {
|
||||
*net.TCPListener //Wrapped listener
|
||||
net.Listener //Wrapped listener
|
||||
stop chan int //Channel used only to indicate listener should shutdown
|
||||
}
|
||||
|
||||
func NewStoppableListener(l net.Listener) (*StoppableListener, error) {
|
||||
/*
|
||||
tcpL, ok := l.(*net.TCPListener)
|
||||
|
||||
if !ok {
|
||||
return nil, errors.New("Cannot wrap listener")
|
||||
}
|
||||
|
||||
*/
|
||||
retval := &StoppableListener{}
|
||||
retval.TCPListener = tcpL
|
||||
retval.Listener = l
|
||||
retval.stop = make(chan int)
|
||||
|
||||
return retval, nil
|
||||
|
@ -30,10 +30,7 @@ var StoppedError = errors.New("Listener stopped")
|
|||
func (sl *StoppableListener) Accept() (net.Conn, error) {
|
||||
|
||||
for {
|
||||
//Wait up to one second for a new connection
|
||||
sl.SetDeadline(time.Now().Add(time.Second))
|
||||
|
||||
newConn, err := sl.TCPListener.Accept()
|
||||
newConn, err := sl.Listener.Accept()
|
||||
|
||||
//Check for the channel being closed
|
||||
select {
|
||||
|
|
Loading…
Reference in New Issue