mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2025-01-18 21:32:30 +01:00
Code Issues Projects Releases Wiki Activity

Convert to use gorilla websockets package.

Browse Source 
Also, since the new websoscket package allows the message type to be set
independently from the type of the variable, remove the casts between
strings and []byte in the websocket read/write paths.  This avoids extra
copies thereby reducing the garbage generated.

Closes #134.
This commit is contained in:
Dave Collins 2014-06-07 00:35:34 -05:00
parent bf48a97b0d
commit 3266bf6a8d
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpcserver.go
View File

@ -6,7 +6,6 @@ package main
import (
"bytes"
"code.google.com/p/go.net/websocket"
"crypto/subtle"
"crypto/tls"
"encoding/base64"
@ -23,6 +22,7 @@ import (
"github.com/conformal/btcwire"
"github.com/conformal/btcws"
"github.com/conformal/fastsha256"
"github.com/conformal/websocket"
"io/ioutil"
"math/big"
"math/rand"
@ -252,12 +252,18 @@ func (s *rpcServer) Start() {
http.Error(w, "401 Unauthorized.", http.StatusUnauthorized)
return
}
wsServer := websocket.Server{
Handler: websocket.Handler(func(ws *websocket.Conn) {
s.WebsocketHandler(ws, r.RemoteAddr, authenticated)
}),
// Attempt to upgrade the connection to a websocket connection
// using the default size for read/write buffers.
ws, err := websocket.Upgrade(w, r, nil, 0, 0)
if err != nil {
if _, ok := err.(websocket.HandshakeError); !ok {
rpcsLog.Errorf("Unexpected websocket error: %v",
err)
}
return
}
wsServer.ServeHTTP(w, r)
s.WebsocketHandler(ws, r.RemoteAddr, authenticated)
})
for _, listener := range s.listeners {

14
rpcwebsocket.go
View File

@ -7,7 +7,6 @@ package main
import (
"bytes"
"code.google.com/p/go.crypto/ripemd160"
"code.google.com/p/go.net/websocket"
"container/list"
"crypto/subtle"
"encoding/base64"
@ -21,6 +20,7 @@ import (
"github.com/conformal/btcwire"
"github.com/conformal/btcws"
"github.com/conformal/fastsha256"
"github.com/conformal/websocket"
"io"
"sync"
"time"
@ -917,11 +917,11 @@ type wsClient struct {
// (including pass through for standard RPC commands), sends the appropriate
// response. It also detects commands which are marked as long-running and
// sends them off to the asyncHander for processing.
func (c *wsClient) handleMessage(msg string) {
func (c *wsClient) handleMessage(msg []byte) {
if !c.authenticated {
// Disconnect immediately if the provided command fails to
// parse when the client is not already authenticated.
cmd, jsonErr := parseCmd([]byte(msg))
cmd, jsonErr := parseCmd(msg)
if jsonErr != nil {
c.Disconnect()
return
@ -961,7 +961,7 @@ func (c *wsClient) handleMessage(msg string) {
}
// Attmpt to parse the raw json into a known btcjson.Cmd.
cmd, jsonErr := parseCmd([]byte(msg))
cmd, jsonErr := parseCmd(msg)
if jsonErr != nil {
// Use the provided id for errors when a valid JSON-RPC message
// was parsed. Requests with no IDs are ignored.
@ -1051,8 +1051,8 @@ out:
default:
}
var msg string
if err := websocket.Message.Receive(c.conn, &msg); err != nil {
_, msg, err := c.conn.ReadMessage()
if err != nil {
// Log the error if it's not due to disconnecting.
if err != io.EOF {
rpcsLog.Errorf("Websocket receive error from "+
@ -1153,7 +1153,7 @@ out:
// closed.
select {
case r := <-c.sendChan:
err := websocket.Message.Send(c.conn, string(r.msg))
err := c.conn.WriteMessage(websocket.TextMessage, r.msg)
if err != nil {
c.Disconnect()
break out