Build the websocket-server.

Patch server.go to refer to out-of-tree websocket library.
This commit is contained in:
David Fifield 2016-03-26 12:06:06 -07:00
parent e53705519e
commit cfca47674e
3 changed files with 3 additions and 3 deletions

1
.gitignore vendored
View file

@ -6,6 +6,7 @@
datadir/ datadir/
client/client client/client
server-webrtc/server-webrtc server-webrtc/server-webrtc
server/server
snowflake.log snowflake.log
proxy/test proxy/test
proxy/build proxy/build

View file

@ -2,4 +2,4 @@
.PHONY: check .PHONY: check
check: check:
! gofmt -l . 2>&1 | read ! gofmt -l . 2>&1 | read
go vet ./broker ./client ./server-webrtc go vet ./broker ./client ./server ./server-webrtc

View file

@ -20,9 +20,8 @@ import (
"syscall" "syscall"
"time" "time"
"../websocket"
"git.torproject.org/pluggable-transports/goptlib.git" "git.torproject.org/pluggable-transports/goptlib.git"
"git.torproject.org/pluggable-transports/websocket.git/websocket"
) )
const ptMethodName = "websocket" const ptMethodName = "websocket"