From 20e7528b25882f16747fa0d955d0ac20186e0d3c Mon Sep 17 00:00:00 2001
From: ginuerzh <ginuerzh@gmail.com>
Date: Tue, 15 Mar 2022 10:43:38 +0800
Subject: [PATCH] revert change for Listener

---
 pkg/listener/listener.go      | 2 +-
 pkg/listener/rtcp/listener.go | 8 ++++----
 pkg/listener/rudp/listener.go | 8 ++++----
 pkg/listener/tcp/listener.go  | 5 ++---
 pkg/listener/tls/listener.go  | 5 ++---
 pkg/listener/udp/listener.go  | 5 ++---
 pkg/metadata/metadata.go      | 4 ++++
 pkg/service/service.go        | 3 +--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkg/listener/listener.go b/pkg/listener/listener.go
index 28cc778..b06b05e 100644
--- a/pkg/listener/listener.go
+++ b/pkg/listener/listener.go
@@ -14,7 +14,7 @@ var (
 // Listener is a server listener, just like a net.Listener.
 type Listener interface {
 	Init(metadata.Metadata) error
-	Accept() (net.Conn, metadata.Metadata, error)
+	Accept() (net.Conn, error)
 	Addr() net.Addr
 	Close() error
 }
diff --git a/pkg/listener/rtcp/listener.go b/pkg/listener/rtcp/listener.go
index c7f440e..b0e7cef 100644
--- a/pkg/listener/rtcp/listener.go
+++ b/pkg/listener/rtcp/listener.go
@@ -57,10 +57,10 @@ func (l *rtcpListener) Init(md md.Metadata) (err error) {
 	return
 }
 
-func (l *rtcpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
+func (l *rtcpListener) Accept() (conn net.Conn, err error) {
 	select {
 	case <-l.closed:
-		return nil, nil, net.ErrClosed
+		return nil, net.ErrClosed
 	default:
 	}
 
@@ -70,7 +70,7 @@ func (l *rtcpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
 			connector.MuxBindOption(true),
 		)
 		if err != nil {
-			return nil, nil, listener.NewAcceptError(err)
+			return nil, listener.NewAcceptError(err)
 		}
 		l.ln = metrics.WrapListener(l.options.Service, l.ln)
 	}
@@ -78,7 +78,7 @@ func (l *rtcpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
 	if err != nil {
 		l.ln.Close()
 		l.ln = nil
-		return nil, nil, listener.NewAcceptError(err)
+		return nil, listener.NewAcceptError(err)
 	}
 	return
 }
diff --git a/pkg/listener/rudp/listener.go b/pkg/listener/rudp/listener.go
index c38f150..16da00e 100644
--- a/pkg/listener/rudp/listener.go
+++ b/pkg/listener/rudp/listener.go
@@ -57,10 +57,10 @@ func (l *rudpListener) Init(md md.Metadata) (err error) {
 	return
 }
 
-func (l *rudpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
+func (l *rudpListener) Accept() (conn net.Conn, err error) {
 	select {
 	case <-l.closed:
-		return nil, nil, net.ErrClosed
+		return nil, net.ErrClosed
 	default:
 	}
 
@@ -73,14 +73,14 @@ func (l *rudpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
 			connector.UDPDataQueueSizeBindOption(l.md.readQueueSize),
 		)
 		if err != nil {
-			return nil, nil, listener.NewAcceptError(err)
+			return nil, listener.NewAcceptError(err)
 		}
 	}
 	conn, err = l.ln.Accept()
 	if err != nil {
 		l.ln.Close()
 		l.ln = nil
-		return nil, nil, listener.NewAcceptError(err)
+		return nil, listener.NewAcceptError(err)
 	}
 
 	if pc, ok := conn.(net.PacketConn); ok {
diff --git a/pkg/listener/tcp/listener.go b/pkg/listener/tcp/listener.go
index d813050..f12af0a 100644
--- a/pkg/listener/tcp/listener.go
+++ b/pkg/listener/tcp/listener.go
@@ -47,9 +47,8 @@ func (l *tcpListener) Init(md md.Metadata) (err error) {
 	return
 }
 
-func (l *tcpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
-	conn, err = l.ln.Accept()
-	return
+func (l *tcpListener) Accept() (conn net.Conn, err error) {
+	return l.ln.Accept()
 }
 
 func (l *tcpListener) Addr() net.Addr {
diff --git a/pkg/listener/tls/listener.go b/pkg/listener/tls/listener.go
index d0e148d..3552411 100644
--- a/pkg/listener/tls/listener.go
+++ b/pkg/listener/tls/listener.go
@@ -51,9 +51,8 @@ func (l *tlsListener) Init(md md.Metadata) (err error) {
 	return
 }
 
-func (l *tlsListener) Accept() (conn net.Conn, md md.Metadata, err error) {
-	conn, err = l.ln.Accept()
-	return
+func (l *tlsListener) Accept() (conn net.Conn, err error) {
+	return l.ln.Accept()
 }
 
 func (l *tlsListener) Addr() net.Addr {
diff --git a/pkg/listener/udp/listener.go b/pkg/listener/udp/listener.go
index 50af706..195a6ce 100644
--- a/pkg/listener/udp/listener.go
+++ b/pkg/listener/udp/listener.go
@@ -60,9 +60,8 @@ func (l *udpListener) Init(md md.Metadata) (err error) {
 	return
 }
 
-func (l *udpListener) Accept() (conn net.Conn, md md.Metadata, err error) {
-	conn, err = l.ln.Accept()
-	return
+func (l *udpListener) Accept() (conn net.Conn, err error) {
+	return l.ln.Accept()
 }
 
 func (l *udpListener) Addr() net.Addr {
diff --git a/pkg/metadata/metadata.go b/pkg/metadata/metadata.go
index 1840e16..19aadb9 100644
--- a/pkg/metadata/metadata.go
+++ b/pkg/metadata/metadata.go
@@ -6,6 +6,10 @@ import (
 	"time"
 )
 
+type Metadatable interface {
+	GetMetadata() Metadata
+}
+
 type Metadata interface {
 	IsExists(key string) bool
 	Set(key string, value any)
diff --git a/pkg/service/service.go b/pkg/service/service.go
index 65e0ec4..5f17257 100644
--- a/pkg/service/service.go
+++ b/pkg/service/service.go
@@ -71,7 +71,7 @@ func (s *service) Serve() error {
 
 	var tempDelay time.Duration
 	for {
-		conn, md, e := s.listener.Accept()
+		conn, e := s.listener.Accept()
 		if e != nil {
 			if ne, ok := e.(net.Error); ok && ne.Temporary() {
 				if tempDelay == 0 {
@@ -111,7 +111,6 @@ func (s *service) Serve() error {
 			if err := s.handler.Handle(
 				context.Background(),
 				conn,
-				handler.MetadataHandleOption(md),
 			); err != nil {
 				s.options.logger.Error(err)
 				metrics.HandlerErrors(s.name).Inc()