Commit61942a4

authored

Merge pull request#299 from photostorm/net-addr

Returns real remote and local address instead mocked

2 parents9873274 +fecf26c commit61942a4Copy full SHA for 61942a4

File tree

+40

-12

lines changed

+40

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,8 @@ func TestConn(t *testing.T) {`
`155`	`155`	`n1.SetDeadline(time.Time{})`
`156`	`156`
`157`	`157`	`assert.Equal(t,"remote addr",n1.RemoteAddr(),n1.LocalAddr())`
`158`		`-assert.Equal(t,"remote addr string","websocket/unknown-addr",n1.RemoteAddr().String())`
`159`		`-assert.Equal(t,"remote addr network","websocket",n1.RemoteAddr().Network())`
	`158`	`+assert.Equal(t,"remote addr string","pipe",n1.RemoteAddr().String())`
	`159`	`+assert.Equal(t,"remote addr network","pipe",n1.RemoteAddr().Network())`
`160`	`160`
`161`	`161`	`errs:=xsync.Go(func()error {`
`162`	`162`	`_,err:=n2.Write([]byte("hello"))`

Lines changed: 7 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,13 @@ import (`
`33`	`33`	`// where only the reading/writing goroutines are interrupted but the connection`
`34`	`34`	`// is kept alive.`
`35`	`35`	`//`
`36`		`-// The Addr methods will return a mock net.Addr that returns "websocket" for Network`
`37`		`-// and "websocket/unknown-addr" for String.`
	`36`	`+// The Addr methods will return the real addresses for connections obtained`
	`37`	`+// from websocket.Accept. But for connections obtained from websocket.Dial, a mock net.Addr`
	`38`	`+// will be returned that gives "websocket" for Network() and "websocket/unknown-addr" for`
	`39`	`+// String(). This is because websocket.Dial only exposes a io.ReadWriteCloser instead of the`
	`40`	`+// full net.Conn to us.`
	`41`	`+//`
	`42`	`+// When running as WASM, the Addr methods will always return the mock address described above.`
`38`	`43`	`//`
`39`	`44`	`// A received StatusNormalClosure or StatusGoingAway close frame will be translated to`
`40`	`45`	`// io.EOF when reading.`
`@@ -181,14 +186,6 @@ func (a websocketAddr) String() string {`
`181`	`186`	`return"websocket/unknown-addr"`
`182`	`187`	`}`
`183`	`188`
`184`		`-func (nc*netConn)RemoteAddr() net.Addr {`
`185`		`-returnwebsocketAddr{}`
`186`		`-}`
`187`		`-`
`188`		`-func (nc*netConn)LocalAddr() net.Addr {`
`189`		`-returnwebsocketAddr{}`
`190`		`-}`
`191`		`-`
`192`	`189`	`func (nc*netConn)SetDeadline(t time.Time)error {`
`193`	`190`	`nc.SetWriteDeadline(t)`
`194`	`191`	`nc.SetReadDeadline(t)`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+package websocket`
	`2`	`+`
	`3`	`+import"net"`
	`4`	`+`
	`5`	`+func (nc*netConn)RemoteAddr() net.Addr {`
	`6`	`+returnwebsocketAddr{}`
	`7`	`+}`
	`8`	`+`
	`9`	`+func (nc*netConn)LocalAddr() net.Addr {`
	`10`	`+returnwebsocketAddr{}`
	`11`	`+}`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+//go:build !js`
	`2`	`+// +build !js`
	`3`	`+`
	`4`	`+package websocket`
	`5`	`+`
	`6`	`+import"net"`
	`7`	`+`
	`8`	`+func (nc*netConn)RemoteAddr() net.Addr {`
	`9`	`+ifunc,ok:=nc.c.rwc.(net.Conn);ok {`
	`10`	`+returnunc.RemoteAddr()`
	`11`	`+}`
	`12`	`+returnwebsocketAddr{}`
	`13`	`+}`
	`14`	`+`
	`15`	`+func (nc*netConn)LocalAddr() net.Addr {`
	`16`	`+ifunc,ok:=nc.c.rwc.(net.Conn);ok {`
	`17`	`+returnunc.LocalAddr()`
	`18`	`+}`
	`19`	`+returnwebsocketAddr{}`
	`20`	`+}`

Comments

(0)