runtimes/google/ipc: rework 'hybrid' websocket protocol support.
- introduce a new protocol type, wsh, which can listen for both
tcp and websocket connections.
- modify vc's to ensure that they use a control byte that can't
be confused with websockets. Roll is straightforward, push to
servers first, update clients, remove old support
Change-Id: I2d68eb51d1c9b50afbaa4c3164a9cef6c927aba1
diff --git a/lib/websocket/conn_nacl.go b/lib/websocket/conn_nacl.go
index e20ced8..0aaf55e 100644
--- a/lib/websocket/conn_nacl.go
+++ b/lib/websocket/conn_nacl.go
@@ -28,7 +28,7 @@
currBuffer []byte
}
-func Dial(address string) (net.Conn, error) {
+func Dial(protocol, address string, timeout time.Duration) (net.Conn, error) {
inst := PpapiInstance
u, err := url.Parse("ws://" + address)
if err != nil {
