Merge pull request #29 from ibuildthecloud/testing

Add ability to set dialer in session

readbuffer.go

@@ -56,7 +56,7 @@ func (r *readBuffer) Read(b []byte) (int, error) {
 
 	for {
 		var (
-			n int
+			n   int
 			err error
 		)
 

server.go

@@ -72,7 +72,6 @@ func (s *Server) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	session.auth = s.ClientConnectAuthorizer
 	defer s.sessions.remove(session)
 
-	// Don't need to associate req.Context() to the Session, it will cancel otherwise
 	code, err := session.Serve(req.Context())
 	if err != nil {
 		// Hijacked so we can't write to the client

session.go

@@ -43,12 +43,17 @@ func init() {
 }
 
 func NewClientSession(auth ConnectAuthorizer, conn *websocket.Conn) *Session {
+	return NewClientSessionWithDialer(auth, conn, nil)
+}
+
+func NewClientSessionWithDialer(auth ConnectAuthorizer, conn *websocket.Conn, dialer Dialer) *Session {
 	return &Session{
 		clientKey: "client",
 		conn:      newWSConn(conn),
 		conns:     map[int64]*connection{},
 		auth:      auth,
 		client:    true,
+		dialer:    dialer,
 	}
 }
 

types.go

@@ -3,8 +3,8 @@ package remotedialer
 import "time"
 
 const (
-	PingWaitDuration  	= 60 * time.Second
-	PingWriteInterval 	= 5 * time.Second
-	MaxRead           	= 8192
-	HandshakeTimeOut	= 10 * time.Second
+	PingWaitDuration  = 60 * time.Second
+	PingWriteInterval = 5 * time.Second
+	MaxRead           = 8192
+	HandshakeTimeOut  = 10 * time.Second
 )