Commit cfca4767 authored Mar 26, 2016 by David Fifield

Build the websocket-server.

Patch server.go to refer to out-of-tree websocket library.

parent e5370551

.gitignore

+1 −0

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

Makefile

+1 −1

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

server/server.go

+1 −2

Original line number	Diff line number	Diff line
		@@ -20,9 +20,8 @@ import (
		"syscall"
		"time"

		"../websocket"

		"git.torproject.org/pluggable-transports/goptlib.git"
		"git.torproject.org/pluggable-transports/websocket.git/websocket"
		)

		const ptMethodName = "websocket"