1 files changed, 25 insertions, 25 deletions

diff --git a/pkg/server/server.go b/pkg/server/server.go
index a7b9b06..571397f 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -1,23 +1,23 @@
 package server
 
 import (
-	"tunnel/pkg/config"
-	"tunnel/pkg/netstring"
-	"tunnel/pkg/server/env"
-	"strings"
-	"errors"
 	"bytes"
-	"sync"
-	"time"
+	"errors"
 	"fmt"
+	"io"
 	"log"
 	"net"
-	"io"
+	"strings"
+	"sync"
+	"time"
+	"tunnel/pkg/config"
+	"tunnel/pkg/netstring"
+	"tunnel/pkg/server/env"
 )
 
 type Server struct {
 	listen net.Listener
-	since time.Time
+	since  time.Time
 
 	wg sync.WaitGroup
 	mu sync.Mutex
@@ -26,7 +26,7 @@ type Server struct {
 	done chan struct{}
 
 	tunnels automap
-	env env.Env
+	env     env.Env
 
 	nextCid int
 }
@@ -87,7 +87,7 @@ func (r *request) Fatalf(format string, v ...interface{}) {
 }
 
 func (r *request) expect(c ...int) {
-	desc := func (n int) string {
+	desc := func(n int) string {
 		var sep string
 
 		if n == 1 {
@@ -99,7 +99,7 @@ func (r *request) expect(c ...int) {
 		return fmt.Sprint(n, sep, "expected")
 	}
 
-	check := func (cond bool, args ...interface{}) {
+	check := func(cond bool, args ...interface{}) {
 		if cond {
 			r.Fatal(args...)
 		}
@@ -119,7 +119,7 @@ func (r *request) expect(c ...int) {
 
 func (s *Server) isDone() bool {
 	select {
-	case <- s.done:
+	case <-s.done:
 		return true
 	default:
 		return false
@@ -133,10 +133,10 @@ func New() (*Server, error) {
 	}
 
 	s := &Server{
-		env: env.New(),
-		listen: listen,
-		since: time.Now(),
-		done: make(chan struct{}),
+		env:     env.New(),
+		listen:  listen,
+		since:   time.Now(),
+		done:    make(chan struct{}),
 		tunnels: make(automap),
 	}
 
@@ -168,7 +168,7 @@ func (s *Server) Run() {
 }
 
 func (s *Server) Stop() {
-	s.once.Do(func () {
+	s.once.Do(func() {
 		close(s.done)
 		s.listen.Close()
 	})
@@ -176,9 +176,9 @@ func (s *Server) Stop() {
 
 func (s *Server) newClient(conn net.Conn) *client {
 	c := &client{
-		s:	s,
-		conn:	conn,
-		id:	s.nextCid,
+		s:    s,
+		conn: conn,
+		id:   s.nextCid,
 	}
 
 	s.nextCid++
@@ -188,9 +188,9 @@ func (s *Server) newClient(conn net.Conn) *client {
 
 func (c *client) newRequest() *request {
 	r := &request{
-		c:	c,
-		id:	c.nextRid,
-		out:	new(bytes.Buffer),
+		c:   c,
+		id:  c.nextRid,
+		out: new(bytes.Buffer),
 	}
 
 	c.nextRid++
@@ -275,7 +275,7 @@ func (r *request) parse(query string) {
 }
 
 func (r *request) run(query string) {
-	defer func () {
+	defer func() {
 		switch err := recover().(type) {
 		case requestError:
 			r.Print(err)