From e81d72100aaf98f4aabf19337923981979f1410f Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Wed, 14 Sep 2011 11:29:11 -0400 Subject: [PATCH] websocket: rename websocket.WebSocketAddr to *websocket.Addr. R=ukai CC=golang-dev https://golang.org/cl/4999043 --- src/pkg/websocket/websocket.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go index bd82131e56..d57d1149c8 100644 --- a/src/pkg/websocket/websocket.go +++ b/src/pkg/websocket/websocket.go @@ -57,13 +57,13 @@ var ( ErrNotSupported = ProtocolError{"not supported"} ) -// WebSocketAddr is an implementation of net.Addr for WebSocket. -type WebSocketAddr struct { +// Addr is an implementation of net.Addr for WebSocket. +type Addr struct { *url.URL } // Network returns the network type for a WebSocket, "websocket". -func (addr WebSocketAddr) Network() string { return "websocket" } +func (addr *Addr) Network() string { return "websocket" } // Config is a WebSocket configuration type Config struct { @@ -219,18 +219,18 @@ func (ws *Conn) IsServerConn() bool { return ws.request != nil } // the WebSocket location for server. func (ws *Conn) LocalAddr() net.Addr { if ws.IsClientConn() { - return WebSocketAddr{ws.config.Origin} + return &Addr{ws.config.Origin} } - return WebSocketAddr{ws.config.Location} + return &Addr{ws.config.Location} } // RemoteAddr returns the WebSocket location for the connection for client, or // the Websocket Origin for server. func (ws *Conn) RemoteAddr() net.Addr { if ws.IsClientConn() { - return WebSocketAddr{ws.config.Location} + return &Addr{ws.config.Location} } - return WebSocketAddr{ws.config.Origin} + return &Addr{ws.config.Origin} } // SetTimeout sets the connection's network timeout in nanoseconds. -- 2.48.1