Move embedded remote helpers to cmd/safcm/

[safcm/safcm.git] / rpc / conn.go

diff --git a/rpc/conn.go b/rpc/conn.go
index b2bcf28a05025317c729136cc7680579dffcfe36..3f7ade144c1c2905254da49eb7924552aa3c362d 100644 (file)
--- a/rpc/conn.go
+++ b/rpc/conn.go
@@ -20,6 +20,7 @@ package rpc
 import (
        "bufio"
        "fmt"
+       "io/fs"
        "os/exec"
        "strings"
        "sync"
@@ -32,8 +33,11 @@ type Conn struct {
        events   chan<- ConnEvent // same as Events, to publish events
        eventsWg sync.WaitGroup
 
-       debug  bool
-       remote string
+       debug     bool
+       sshRemote string
+       sshOpts   []string
+
+       remoteHelpers fs.FS
 
        cmd  *exec.Cmd
        conn *safcm.GobConn
@@ -54,7 +58,7 @@ type ConnEvent struct {
 }
 
 // NewConn creates a new connection. Events in the returned struct must be
-// regularly read or the connection will stall. This must be done before
+// regularly read or the connection will hang. This must be done before
 // DialSSH is called to open a connection.
 func NewConn(debug bool) *Conn {
        ch := make(chan ConnEvent)
@@ -123,9 +127,14 @@ func (c *Conn) wait() error {
 }
 
 // Kill forcefully terminates the connection. It's safe to call Kill (and
-// Wait) multiple times.
+// Wait) multiple times. Calling it before Dial*() was called will only close
+// the Events channel.
 func (c *Conn) Kill() error {
        if c.cmd == nil {
+               if c.events != nil {
+                       close(c.events)
+                       c.events = nil
+               }
                return fmt.Errorf("Dial*() not called or already terminated")
        }