3 files changed, 16 insertions, 16 deletions

diff --git a/pkg/server/socket/auto.go b/pkg/server/socket/defer.go
index 97bc625..bfb2157 100644
--- a/pkg/server/socket/auto.go
+++ b/pkg/server/socket/defer.go
@@ -5,27 +5,27 @@ import (
 	"tunnel/pkg/server/queue"
 )
 
-type autoSocket struct {
+type deferSocket struct {
 	S
 }
 
-type autoChannel struct {
-	s *autoSocket
+type deferChannel struct {
+	s *deferSocket
 	c chan Channel
 	e env.Env
 }
 
-func newAutoSocket(proto, addr string) (S, error) {
+func newDeferSocket(proto, addr string) (S, error) {
 	s, err := newDialSocket(proto, addr)
 	if err != nil {
 		return s, err
 	}
 
-	return &autoSocket{s}, nil
+	return &deferSocket{s}, nil
 }
 
-func (s *autoSocket) Open(env env.Env) (Channel, error) {
-	c := &autoChannel{
+func (s *deferSocket) Open(env env.Env) (Channel, error) {
+	c := &deferChannel{
 		s: s,
 		c: make(chan Channel),
 		e: env,
@@ -34,11 +34,11 @@ func (s *autoSocket) Open(env env.Env) (Channel, error) {
 	return c, nil
 }
 
-func (c *autoChannel) String() string {
-	return "auto"
+func (c *deferChannel) String() string {
+	return "defer"
 }
 
-func (c *autoChannel) Send(wq queue.Q) error {
+func (c *deferChannel) Send(wq queue.Q) error {
 	if x := <-c.c; x == nil {
 		return nil
 	} else {
@@ -46,7 +46,7 @@ func (c *autoChannel) Send(wq queue.Q) error {
 	}
 }
 
-func (c *autoChannel) Recv(rq queue.Q) error {
+func (c *deferChannel) Recv(rq queue.Q) error {
 	b := <-rq
 	if b == nil {
 		close(c.c)
@@ -75,6 +75,6 @@ func (c *autoChannel) Recv(rq queue.Q) error {
 }
 
 /* TODO */
-func (c *autoChannel) Close() error {
+func (c *deferChannel) Close() error {
 	return nil
 }
diff --git a/pkg/server/socket/dial.go b/pkg/server/socket/dial.go
index 818fbc6..d4c20e1 100644
--- a/pkg/server/socket/dial.go
+++ b/pkg/server/socket/dial.go
@@ -26,8 +26,8 @@ func (s *dialSocket) String() string {
 	return fmt.Sprintf("%s/%s", s.proto, s.addr)
 }
 
-func (s *dialSocket) Open(env.Env) (Channel, error) {
-	conn, err := net.Dial(s.proto, s.addr)
+func (s *dialSocket) Open(e env.Env) (Channel, error) {
+	conn, err := net.Dial(s.proto, e.Eval(s.addr))
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/server/socket/socket.go b/pkg/server/socket/socket.go
index 7b5ea73..1d447f8 100644
--- a/pkg/server/socket/socket.go
+++ b/pkg/server/socket/socket.go
@@ -107,8 +107,8 @@ func New(desc string, env env.Env) (S, error) {
 		return newListenSocket(proto, addr)
 	}
 
-	if _, ok := opts["auto"]; ok {
-		return newAutoSocket(proto, addr)
+	if _, ok := opts["defer"]; ok {
+		return newDeferSocket(proto, addr)
 	}
 
 	return newDialSocket(proto, addr)