improve closeup

conn/conn.go

@@ -31,6 +31,16 @@ func (c Conn) Keys() (*sam3.I2PKeys, error) {
 	return c.SaveKeys()
 }
 
+func (m Conn) Cleanup() error {
+	if err := m.SAMConn.Close(); err != nil {
+		return err
+	}
+	if err := m.StreamSession.Close(); err != nil {
+		return err
+	}
+	return nil
+}
+
 func NewConn(sam *sam3.SAM, addr, path string, opts []string) (*Conn, error) {
 	var c Conn
 	var err error

conn/conn_options.go

@@ -0,0 +1 @@
+package conn

conn/conn_test.go

@@ -0,0 +1 @@
+package conn

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"log"
 	"os"
 	"os/signal"
 	"strings"
@@ -141,7 +142,9 @@ func main() {
 		go func() {
 			for sig := range c {
 				if sig == os.Interrupt {
-					//tunsocks.Cleanup()
+					if err := tunsocks.Cleanup(); nil {
+						log.Println(err.Error())
+					}
 				}
 			}
 		}()
@@ -149,5 +152,4 @@ func main() {
 	} else {
 		panic(tunerr)
 	}
-
 }

resolve/resolver.go

@@ -33,6 +33,10 @@ func (r Resolver) ResolveI2P(ctx context.Context, name string) (context.Context,
 	return ctx, &raddr, nil
 }
 
+func (r Resolver) Cleanup() error {
+	return r.SAMResolver.SAM.Close()
+}
+
 func (r Resolver) ValidateI2PAddr(name string) bool {
 	noi2p := false
 	for _, suffix := range r.allowedSuffixes {

resolve/resolver_test.go

@@ -0,0 +1 @@
+package resolver

socks/manager.go

@@ -53,6 +53,15 @@ func (m Manager) Dial(ctx context.Context, network, addr string) (net.Conn, erro
 	return m.DialI2P(ctx, addr)
 }
 
+func (m Manager) Cleanup() error {
+	for _, c := range m.conns {
+		if err := c.Cleanup(); err != nil {
+			return err
+		}
+	}
+	return m.SAM.Close()
+}
+
 func NewManager(samhost, samport, datadir string, samopts []string) (*Manager, error) {
 	return NewManagerFromOptions(
 		SetHost(samhost),