1 files changed, 21 insertions, 21 deletions

diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
index 91d7533..e00db6c 100644
--- a/pkg/server/tunnel.go
+++ b/pkg/server/tunnel.go
@@ -12,7 +12,7 @@ import (
 	"time"
 	"tunnel/pkg/config"
 	"tunnel/pkg/server/env"
-	"tunnel/pkg/server/module"
+	"tunnel/pkg/server/hook"
 	"tunnel/pkg/server/queue"
 	"tunnel/pkg/server/socket"
 )
@@ -41,7 +41,7 @@ type tunnel struct {
 	done chan struct{}
 
 	in, out socket.S
-	m       []module.M
+	hooks   []hook.H
 
 	env env.Env
 }
@@ -187,14 +187,14 @@ func (s *stream) channel(c socket.Channel, rq, wq queue.Q) {
 	}()
 }
 
-func (s *stream) pipe(m module.M, f module.Func, rq, wq queue.Q) {
+func (s *stream) pipe(h hook.H, f hook.Func, rq, wq queue.Q) {
 	s.wg.Add(1)
 
 	go func() {
 		defer s.wg.Done()
 
 		if err := f(rq, wq); err != nil && !errors.Is(err, io.EOF) {
-			log.Println(s.t, s, m, err)
+			log.Println(s.t, s, h, err)
 		}
 
 		close(wq)
@@ -209,23 +209,23 @@ func (s *stream) run() {
 
 	s.channel(s.in, rq, wq)
 
-	for _, m := range s.t.m {
-		send, recv, err := module.Open(m, s.env)
+	for _, h := range s.t.hooks {
+		send, recv, err := hook.Open(h, s.env)
 		if err != nil {
 			// FIXME: abort stream on error
-			log.Println(s.t, s, m, err)
+			log.Println(s.t, s, h, err)
 			continue
 		}
 
 		if send != nil {
 			q := queue.New()
-			s.pipe(m, send, wq, q)
+			s.pipe(h, send, wq, q)
 			wq = q
 		}
 
 		if recv != nil {
 			q := queue.New()
-			s.pipe(m, recv, q, rq)
+			s.pipe(h, recv, q, rq)
 			rq = q
 		}
 	}
@@ -238,23 +238,23 @@ func (s *stream) stop() {
 	s.out.Close()
 }
 
-func parseModules(args []string, env env.Env) ([]module.M, error) {
-	var mm []module.M
+func parseHooks(args []string, env env.Env) ([]hook.H, error) {
+	var hooks []hook.H
 
 	for _, arg := range args {
-		if m, err := module.New(arg, env); err != nil {
+		if h, err := hook.New(arg, env); err != nil {
 			return nil, err
 		} else {
-			mm = append(mm, m)
+			hooks = append(hooks, h)
 		}
 	}
 
-	return mm, nil
+	return hooks, nil
 }
 
 func newTunnel(args []string, env env.Env) (*tunnel, error) {
 	var in, out socket.S
-	var mm []module.M
+	var hooks []hook.H
 	var err error
 
 	n := len(args) - 1
@@ -268,7 +268,7 @@ func newTunnel(args []string, env env.Env) (*tunnel, error) {
 		return nil, err
 	}
 
-	if mm, err = parseModules(args[1:n], env); err != nil {
+	if hooks, err = parseHooks(args[1:n], env); err != nil {
 		in.Close()
 		out.Close()
 		return nil, err
@@ -278,7 +278,7 @@ func newTunnel(args []string, env env.Env) (*tunnel, error) {
 		args:    strings.Join(args, " "),
 		quit:    make(chan struct{}),
 		done:    make(chan struct{}),
-		m:       mm,
+		hooks:   hooks,
 		in:      in,
 		out:     out,
 		env:     env,
@@ -410,9 +410,9 @@ func showStreams(r *request) {
 	})
 }
 
-func showModules(r *request) {
-	for _, m := range module.GetList() {
-		r.Println(m)
+func showHooks(r *request) {
+	for _, h := range hook.GetList() {
+		r.Println(h)
 	}
 }
 
@@ -422,7 +422,7 @@ func init() {
 
 	newCmd(tunnelRename, "rename")
 
-	newCmd(showModules, "modules")
+	newCmd(showHooks, "hooks")
 	newCmd(showStreams, "streams")
 	newCmd(showTunnels, "show")
 }