add Close method to interface, fix closing of StaticAutoNAT

libp2p · Aug 29, 2021 · f62691d · f62691d
1 parent e6e029f
commit f62691d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/autonat.go b/autonat.go
@@ -433,7 +433,9 @@ func (as *AmbientAutoNAT) getPeerToProbe() peer.ID {
 
 func (as *AmbientAutoNAT) Close() error {
 	as.ctxCancel()
-	as.service.Disable()
+	if as.service != nil {
+		as.service.Disable()
+	}
 	<-as.backgroundRunning
 	return nil
 }
@@ -457,3 +459,10 @@ func (s *StaticAutoNAT) PublicAddr() (ma.Multiaddr, error) {
 	}
 	return nil, errors.New("no available address")
 }
+
+func (s *StaticAutoNAT) Close() error {
+	if s.service != nil {
+		s.service.Disable()
+	}
+	return nil
+}
diff --git a/interface.go b/interface.go
@@ -2,6 +2,7 @@ package autonat
 
 import (
 	"context"
+	"io"
 
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
@@ -16,6 +17,7 @@ type AutoNAT interface {
 	// PublicAddr returns the public dial address when NAT status is public and an
 	// error otherwise
 	PublicAddr() (ma.Multiaddr, error)
+	io.Closer
 }
 
 // Client is a stateless client interface to AutoNAT peers