fix(conn): add local and remote address

Author: kehiy

accept.go

@@ -11,12 +11,10 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"net"
 	"net/http"
 	"net/textproto"
 	"net/url"
 	"path"
-	"strconv"
 	"strings"
 
 	"github.com/coder/websocket/internal/errd"
@@ -152,34 +150,12 @@ func accept(w http.ResponseWriter, r *http.Request, opts *AcceptOptions) (_ *Con
 	b, _ := brw.Reader.Peek(brw.Reader.Buffered())
 	brw.Reader.Reset(io.MultiReader(bytes.NewReader(b), netConn))
 
-	ipStr, portStr, err := net.SplitHostPort(r.RemoteAddr)
-	if err != nil {
-		err = errors.New("*http.Request contains invalid RemoteAddr")
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return nil, err
-	}
-
-	ip := net.ParseIP(ipStr)
-	if ip == nil {
-		err = errors.New("*http.Request contains invalid IP address")
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return nil, err
-	}
-
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		err = errors.New("*http.Request contains invalid port number")
-		http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
-		return nil, err
-	}
-
 	return newConn(connConfig{
 		subprotocol:    w.Header().Get("Sec-WebSocket-Protocol"),
 		rwc:            netConn,
 		client:         false,
 		copts:          copts,
 		flateThreshold: opts.CompressionThreshold,
-		remoteAddr:     &net.TCPAddr{IP: ip, Port: port},
 
 		br: brw.Reader,
 		bw: brw.Writer,

conn.go

@@ -49,7 +49,6 @@ type Conn struct {
 	client         bool
 	copts          *compressionOptions
 	flateThreshold int
-	remoteAddr     net.Addr
 	br             *bufio.Reader
 	bw             *bufio.Writer
 
@@ -89,7 +88,6 @@ type connConfig struct {
 	client         bool
 	copts          *compressionOptions
 	flateThreshold int
-	remoteAddr     net.Addr
 
 	br *bufio.Reader
 	bw *bufio.Writer
@@ -102,7 +100,6 @@ func newConn(cfg connConfig) *Conn {
 		client:         cfg.client,
 		copts:          cfg.copts,
 		flateThreshold: cfg.flateThreshold,
-		remoteAddr:     cfg.remoteAddr,
 
 		br: cfg.br,
 		bw: cfg.bw,
@@ -197,7 +194,18 @@ func (c *Conn) flate() bool {
 
 // RemoteAddr returns the remote address of websocket connection.
 func (c *Conn) RemoteAddr() net.Addr {
-	return c.remoteAddr
+	if unc, ok := c.rwc.(net.Conn); ok {
+		return unc.RemoteAddr()
+	}
+	return websocketAddr{}
+}
+
+// LocalAddr returns the local address of websocket connection.
+func (c *Conn) LocalAddr() net.Addr {
+	if unc, ok := c.rwc.(net.Conn); ok {
+		return unc.LocalAddr()
+	}
+	return websocketAddr{}
 }
 
 // Ping sends a ping to the peer and waits for a pong.