Skip to content

Add listener close function #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmorn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add listener close function #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions format/rtmp/rtmp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ func DialTimeout(uri string, timeout time.Duration) (conn *Conn, err error) {
}

type Server struct {
listener *net.TCPListener

Addr string
HandlePublish func(*Conn)
HandlePlay func(*Conn)
Expand Down Expand Up @@ -93,8 +95,7 @@ func (self *Server) ListenAndServe() (err error) {
return
}

var listener *net.TCPListener
if listener, err = net.ListenTCP("tcp", tcpaddr); err != nil {
if self.listener, err = net.ListenTCP("tcp", tcpaddr); err != nil {
return
}

Expand All @@ -104,7 +105,7 @@ func (self *Server) ListenAndServe() (err error) {

for {
var netconn net.Conn
if netconn, err = listener.Accept(); err != nil {
if netconn, err = self.listener.Accept(); err != nil {
return
}

Expand All @@ -123,6 +124,13 @@ func (self *Server) ListenAndServe() (err error) {
}
}

func (self *Server) Close() error {
if self.listener == nil {
return fmt.Errorf("server is not listening")
}
return self.listener.Close()
}

const (
stageHandshakeDone = iota + 1
stageCommandDone
Expand Down