- tor-commits - lists.torproject.org

[snowflake/master] move webRTCConn into separate file
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit f86f5b5b07d8b9409a58d85f3169e85446fd17e8 Author: Serene Han <keroserene+git(a)gmail.com> Date: Sun Feb 21 22:03:17 2016 -0800 move webRTCConn into separate file --- client/snowflake.go | 247 -------------------------------------------------- client/webrtc.go | 255 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 247 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 4e31f15..cc7f547 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -3,10 +3,8 @@ package main import ( "bufio" - "bytes" "errors" "flag" - "fmt" "io" "log" "net" @@ -14,7 +12,6 @@ import ( "os/signal" "sync" "syscall" - "time" "git.torproject.org/pluggable-transports/goptlib.git" "github.com/keroserene/go-webrtc" @@ -57,250 +54,6 @@ type SnowflakeChannel interface { Close() error } -// Implements net.Conn interface -type webRTCConn struct { - config *webrtc.Configuration - pc *webrtc.PeerConnection - snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. - broker *BrokerChannel - offerChannel chan *webrtc.SessionDescription - answerChannel chan *webrtc.SessionDescription - errorChannel chan error - writeChannel chan []byte - recvPipe *io.PipeReader - writePipe *io.PipeWriter - buffer bytes.Buffer - reset chan struct{} - *BytesInfo -} - -var webrtcRemote *webRTCConn - -func (c *webRTCConn) Read(b []byte) (int, error) { - return c.recvPipe.Read(b) -} - -func (c *webRTCConn) Write(b []byte) (int, error) { - c.SendData(b) - return len(b), nil -} - -func (c *webRTCConn) Close() error { - // Data channel closed implicitly? - return c.pc.Close() -} - -func (c *webRTCConn) LocalAddr() net.Addr { - return nil -} - -func (c *webRTCConn) RemoteAddr() net.Addr { - return nil -} - -func (c *webRTCConn) SetDeadline(t time.Time) error { - return fmt.Errorf("SetDeadline not implemented") -} - -func (c *webRTCConn) SetReadDeadline(t time.Time) error { - return fmt.Errorf("SetReadDeadline not implemented") -} - -func (c *webRTCConn) SetWriteDeadline(t time.Time) error { - return fmt.Errorf("SetWriteDeadline not implemented") -} - -func (c *webRTCConn) PreparePeerConnection() { - if nil != c.pc { - c.pc.Close() - c.pc = nil - } - pc, err := webrtc.NewPeerConnection(c.config) - if err != nil { - log.Printf("NewPeerConnection: %s", err) - c.errorChannel <- err - } - // Prepare PeerConnection callbacks. - pc.OnNegotiationNeeded = func() { - log.Println("WebRTC: OnNegotiationNeeded") - go func() { - offer, err := pc.CreateOffer() - // TODO: Potentially timeout and retry if ICE isn't working. - if err != nil { - c.errorChannel <- err - return - } - err = pc.SetLocalDescription(offer) - if err != nil { - c.errorChannel <- err - return - } - }() - } - // Allow candidates to accumulate until OnIceComplete. - pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf(candidate.Candidate) - } - // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. - pc.OnIceComplete = func() { - log.Printf("WebRTC: OnIceComplete") - c.offerChannel <- pc.LocalDescription() - } - // This callback is not expected, as the Client initiates the creation - // of the data channel, not the remote peer. - pc.OnDataChannel = func(channel *webrtc.DataChannel) { - log.Println("OnDataChannel") - panic("Unexpected OnDataChannel!") - } - c.pc = pc - log.Println("WebRTC: PeerConnection created.") -} - -// Create a WebRTC DataChannel locally. -func (c *webRTCConn) EstablishDataChannel() error { - dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) - // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare - // an SDP offer while other goroutines operating on this struct handle the - // signaling. Eventually fires "OnOpen". - if err != nil { - log.Printf("CreateDataChannel: %s", err) - return err - } - dc.OnOpen = func() { - log.Println("WebRTC: DataChannel.OnOpen") - if nil != c.snowflake { - panic("PeerConnection snowflake already exists.") - } - // Flush the buffer, then enable datachannel. - dc.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - c.snowflake = dc - } - dc.OnClose = func() { - // Disable the DataChannel as a write destination. - // Future writes will go to the buffer until a new DataChannel is available. - log.Println("WebRTC: DataChannel.OnClose") - // Only reset if this OnClose was triggered remotely. - if nil != c.snowflake { - c.snowflake = nil - c.Reset() - } - } - dc.OnMessage = func(msg []byte) { - c.BytesInfo.AddInbound(len(msg)) - n, err := c.writePipe.Write(msg) - if err != nil { - // TODO: Maybe shouldn't actually close. - log.Println("Error writing to SOCKS pipe") - c.writePipe.CloseWithError(err) - } - if n != len(msg) { - panic("short write") - } - } - log.Println("WebRTC: DataChannel created.") - return nil -} - -// Block until an offer is available, then send it to either -// the Broker or signal pipe. -func (c *webRTCConn) SendOffer() error { - select { - case offer := <-c.offerChannel: - if "" == brokerURL { - log.Printf("Please Copy & Paste the following to the peer:") - log.Printf("----------------") - fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") - log.Printf("----------------") - return nil - } - // Otherwise, use Broker. - go func() { - log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, - "\nFront URL: ", frontDomain) - answer, err := c.broker.Negotiate(c.pc.LocalDescription()) - if nil != err || nil == answer { - log.Printf("BrokerChannel error: %s", err) - answer = nil - } - c.answerChannel <- answer - }() - case err := <-c.errorChannel: - c.pc.Close() - return err - } - return nil -} - -func (c *webRTCConn) ReceiveAnswer() { - go func() { - answer, ok := <-c.answerChannel - if !ok || nil == answer { - log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) - <-time.After(time.Second * ReconnectTimeout) - c.Reset() - return - } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) - err := c.pc.SetRemoteDescription(answer) - if nil != err { - c.errorChannel <- err - } - }() -} - -func (c *webRTCConn) SendData(data []byte) { - c.BytesInfo.AddOutbound(len(data)) - // Buffer the data in case datachannel isn't available yet. - if nil == c.snowflake { - log.Printf("Buffered %d bytes --> WebRTC", len(data)) - c.buffer.Write(data) - return - } - c.writeChannel <- data -} - -// Expected in own goroutine. -func (c *webRTCConn) SendLoop() { - log.Println("send loop") - for data := range c.writeChannel { - // Flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - } - c.snowflake.Send(data) - } -} - -// WebRTC re-establishment loop. Expected in own goroutine. -func (c *webRTCConn) ConnectLoop() { - for { - log.Println("Establishing WebRTC connection...") - // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be re-prepared each time. - c.PreparePeerConnection() - err := c.EstablishDataChannel() - if err == nil { - c.SendOffer() - c.ReceiveAnswer() - <-c.reset - log.Println(" --- snowflake connection reset ---") - } else { - log.Println("WebRTC: Could not establish DataChannel.") - } - } -} - -func (c *webRTCConn) Reset() { - go func() { - c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. - log.Println("WebRTC resetting...") - }() -} - // Initialize a WebRTC Connection. func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( *webRTCConn, error) { diff --git a/client/webrtc.go b/client/webrtc.go new file mode 100644 index 0000000..b1e1628 --- /dev/null +++ b/client/webrtc.go @@ -0,0 +1,255 @@ +package main + +import ( + "bytes" + "fmt" + "github.com/keroserene/go-webrtc" + "io" + "log" + "net" + "time" +) + +// Implements net.Conn interface +type webRTCConn struct { + config *webrtc.Configuration + pc *webrtc.PeerConnection + snowflake SnowflakeChannel // Interface holding the WebRTC DataChannel. + broker *BrokerChannel + offerChannel chan *webrtc.SessionDescription + answerChannel chan *webrtc.SessionDescription + errorChannel chan error + writeChannel chan []byte + recvPipe *io.PipeReader + writePipe *io.PipeWriter + buffer bytes.Buffer + reset chan struct{} + *BytesInfo +} + +var webrtcRemote *webRTCConn + +func (c *webRTCConn) Read(b []byte) (int, error) { + return c.recvPipe.Read(b) +} + +func (c *webRTCConn) Write(b []byte) (int, error) { + c.SendData(b) + return len(b), nil +} + +func (c *webRTCConn) Close() error { + // Data channel closed implicitly? + return c.pc.Close() +} + +func (c *webRTCConn) LocalAddr() net.Addr { + return nil +} + +func (c *webRTCConn) RemoteAddr() net.Addr { + return nil +} + +func (c *webRTCConn) SetDeadline(t time.Time) error { + return fmt.Errorf("SetDeadline not implemented") +} + +func (c *webRTCConn) SetReadDeadline(t time.Time) error { + return fmt.Errorf("SetReadDeadline not implemented") +} + +func (c *webRTCConn) SetWriteDeadline(t time.Time) error { + return fmt.Errorf("SetWriteDeadline not implemented") +} + +func (c *webRTCConn) PreparePeerConnection() { + if nil != c.pc { + c.pc.Close() + c.pc = nil + } + pc, err := webrtc.NewPeerConnection(c.config) + if err != nil { + log.Printf("NewPeerConnection: %s", err) + c.errorChannel <- err + } + // Prepare PeerConnection callbacks. + pc.OnNegotiationNeeded = func() { + log.Println("WebRTC: OnNegotiationNeeded") + go func() { + offer, err := pc.CreateOffer() + // TODO: Potentially timeout and retry if ICE isn't working. + if err != nil { + c.errorChannel <- err + return + } + err = pc.SetLocalDescription(offer) + if err != nil { + c.errorChannel <- err + return + } + }() + } + // Allow candidates to accumulate until OnIceComplete. + pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { + log.Printf(candidate.Candidate) + } + // TODO: This may soon be deprecated, consider OnIceGatheringStateChange. + pc.OnIceComplete = func() { + log.Printf("WebRTC: OnIceComplete") + c.offerChannel <- pc.LocalDescription() + } + // This callback is not expected, as the Client initiates the creation + // of the data channel, not the remote peer. + pc.OnDataChannel = func(channel *webrtc.DataChannel) { + log.Println("OnDataChannel") + panic("Unexpected OnDataChannel!") + } + c.pc = pc + log.Println("WebRTC: PeerConnection created.") +} + +// Create a WebRTC DataChannel locally. +func (c *webRTCConn) EstablishDataChannel() error { + dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) + // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare + // an SDP offer while other goroutines operating on this struct handle the + // signaling. Eventually fires "OnOpen". + if err != nil { + log.Printf("CreateDataChannel: %s", err) + return err + } + dc.OnOpen = func() { + log.Println("WebRTC: DataChannel.OnOpen") + if nil != c.snowflake { + panic("PeerConnection snowflake already exists.") + } + // Flush the buffer, then enable datachannel. + dc.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + c.snowflake = dc + } + dc.OnClose = func() { + // Disable the DataChannel as a write destination. + // Future writes will go to the buffer until a new DataChannel is available. + log.Println("WebRTC: DataChannel.OnClose") + // Only reset if this OnClose was triggered remotely. + if nil != c.snowflake { + c.snowflake = nil + c.Reset() + } + } + dc.OnMessage = func(msg []byte) { + c.BytesInfo.AddInbound(len(msg)) + n, err := c.writePipe.Write(msg) + if err != nil { + // TODO: Maybe shouldn't actually close. + log.Println("Error writing to SOCKS pipe") + c.writePipe.CloseWithError(err) + } + if n != len(msg) { + panic("short write") + } + } + log.Println("WebRTC: DataChannel created.") + return nil +} + +// Block until an offer is available, then send it to either +// the Broker or signal pipe. +func (c *webRTCConn) SendOffer() error { + select { + case offer := <-c.offerChannel: + if "" == brokerURL { + log.Printf("Please Copy & Paste the following to the peer:") + log.Printf("----------------") + fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") + log.Printf("----------------") + return nil + } + // Otherwise, use Broker. + go func() { + log.Println("Sending offer via BrokerChannel...\nTarget URL: ", brokerURL, + "\nFront URL: ", frontDomain) + answer, err := c.broker.Negotiate(c.pc.LocalDescription()) + if nil != err || nil == answer { + log.Printf("BrokerChannel error: %s", err) + answer = nil + } + c.answerChannel <- answer + }() + case err := <-c.errorChannel: + c.pc.Close() + return err + } + return nil +} + +func (c *webRTCConn) ReceiveAnswer() { + go func() { + answer, ok := <-c.answerChannel + if !ok || nil == answer { + log.Printf("Failed to retrieve answer. Retrying in %d seconds", ReconnectTimeout) + <-time.After(time.Second * ReconnectTimeout) + c.Reset() + return + } + log.Printf("Received Answer:\n\n%s\n", answer.Sdp) + err := c.pc.SetRemoteDescription(answer) + if nil != err { + c.errorChannel <- err + } + }() +} + +func (c *webRTCConn) SendData(data []byte) { + c.BytesInfo.AddOutbound(len(data)) + // Buffer the data in case datachannel isn't available yet. + if nil == c.snowflake { + log.Printf("Buffered %d bytes --> WebRTC", len(data)) + c.buffer.Write(data) + return + } + c.writeChannel <- data +} + +// Expected in own goroutine. +func (c *webRTCConn) SendLoop() { + log.Println("send loop") + for data := range c.writeChannel { + // Flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + } + c.snowflake.Send(data) + } +} + +// WebRTC re-establishment loop. Expected in own goroutine. +func (c *webRTCConn) ConnectLoop() { + for { + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be re-prepared each time. + c.PreparePeerConnection() + err := c.EstablishDataChannel() + if err == nil { + c.SendOffer() + c.ReceiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } else { + log.Println("WebRTC: Could not establish DataChannel.") + } + } +} + +func (c *webRTCConn) Reset() { + go func() { + c.reset <- struct{}{} // Attempt to negotiate a new datachannel.. + log.Println("WebRTC resetting...") + }() +}

1 0

[snowflake/master] simplify client handler & dialWebRTC with independent webRTCConn constructor
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 3a7e0ea620107dd35f7cea3fac25dd3c8591b0c5 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 23 16:51:04 2016 -0800 simplify client handler & dialWebRTC with independent webRTCConn constructor --- client/client_test.go | 12 +++--- client/snowflake.go | 55 ++++++++++---------------- client/webrtc.go | 105 +++++++++++++++++++++++++++++++------------------- 3 files changed, 92 insertions(+), 80 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 14e9393..cad40de 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -33,19 +33,19 @@ func TestConnect(t *testing.T) { } So(c.buffer.Bytes(), ShouldEqual, nil) - Convey("SendData buffers when datachannel is nil", func() { - c.SendData([]byte("test")) + Convey("sendData buffers when datachannel is nil", func() { + c.sendData([]byte("test")) c.snowflake = nil So(c.buffer.Bytes(), ShouldResemble, []byte("test")) }) - Convey("SendData sends to datachannel when not nil", func() { + Convey("sendData sends to datachannel when not nil", func() { mock := new(MockDataChannel) mock.done = make(chan bool) go c.SendLoop() c.writeChannel = make(chan []byte) c.snowflake = mock - c.SendData([]byte("test")) + c.sendData([]byte("test")) <-mock.done So(c.buffer.Bytes(), ShouldEqual, nil) So(mock.destination.Bytes(), ShouldResemble, []byte("test")) @@ -55,7 +55,7 @@ func TestConnect(t *testing.T) { c.answerChannel = make(chan *webrtc.SessionDescription) c.config = webrtc.NewConfiguration() c.PreparePeerConnection() - c.ReceiveAnswer() + c.receiveAnswer() sdp := webrtc.DeserializeSessionDescription("test") c.answerChannel <- sdp So(c.pc.RemoteDescription(), ShouldEqual, sdp) @@ -65,7 +65,7 @@ func TestConnect(t *testing.T) { Convey("Receive answer fails on nil answer", func() { c.reset = make(chan struct{}) c.answerChannel = make(chan *webrtc.SessionDescription) - c.ReceiveAnswer() + c.receiveAnswer() c.answerChannel <- nil <-c.reset }) diff --git a/client/snowflake.go b/client/snowflake.go index cc7f547..29d263a 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -18,7 +18,8 @@ import ( ) var ptInfo pt.ClientInfo -var logFile *os.File + +// var logFile *os.File var brokerURL string var frontDomain string @@ -35,13 +36,13 @@ func copyLoop(a, b net.Conn) { wg.Add(2) // TODO fix copy loop recovery go func() { - io.Copy(b, a) - log.Println("copy loop b-a break") + written, err := io.Copy(b, a) + log.Println("copy loop b-a break", err, written) wg.Done() }() go func() { - io.Copy(a, b) - log.Println("copy loop a-b break") + written, err := io.Copy(a, b) + log.Println("copy loop a-b break", err, written) wg.Done() }() wg.Wait() @@ -55,27 +56,22 @@ type SnowflakeChannel interface { } // Initialize a WebRTC Connection. -func dialWebRTC(config *webrtc.Configuration, broker *BrokerChannel) ( - *webRTCConn, error) { - connection := new(webRTCConn) - connection.config = config - connection.broker = broker - connection.offerChannel = make(chan *webrtc.SessionDescription) - connection.answerChannel = make(chan *webrtc.SessionDescription) - connection.writeChannel = make(chan []byte) - connection.errorChannel = make(chan error) - connection.reset = make(chan struct{}) - connection.BytesInfo = &BytesInfo{ - inboundChan: make(chan int), outboundChan: make(chan int), - inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, - } - go connection.BytesInfo.Log() +func dialWebRTC() (*webRTCConn, error) { + + // TODO: [#3] Fetch ICE server information from Broker. + // TODO: [#18] Consider TURN servers here too. + config := webrtc.NewConfiguration( + webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - // Pipes remain the same even when DataChannel gets switched. - connection.recvPipe, connection.writePipe = io.Pipe() + broker := NewBrokerChannel(brokerURL, frontDomain) + if nil == broker { + return nil, errors.New("Failed to prepare BrokerChannel") + } + connection := NewWebRTCConnection(config, broker) go connection.ConnectLoop() go connection.SendLoop() + return connection, nil } @@ -105,16 +101,7 @@ func handler(conn *pt.SocksConn) error { defer conn.Close() log.Println("handler fired:", conn) - // TODO: [#3] Fetch ICE server information from Broker. - // TODO: [#18] Consider TURN servers here too. - config := webrtc.NewConfiguration( - webrtc.OptionIceServer("stun:stun.l.google.com:19302")) - broker := NewBrokerChannel(brokerURL, frontDomain) - if nil == broker { - conn.Reject() - return errors.New("Failed to prepare BrokerChannel") - } - remote, err := dialWebRTC(config, broker) + remote, err := dialWebRTC() if err != nil { conn.Reject() return err @@ -174,12 +161,12 @@ func readSignalingMessages(f *os.File) { } func main() { - var err error + // var err error webrtc.SetLoggingVerbosity(1) flag.StringVar(&brokerURL, "url", "", "URL of signaling broker") flag.StringVar(&frontDomain, "front", "", "front domain") flag.Parse() - logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) + logFile, err := os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { log.Fatal(err) } diff --git a/client/webrtc.go b/client/webrtc.go index b1e1628..89d1592 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -34,7 +34,7 @@ func (c *webRTCConn) Read(b []byte) (int, error) { } func (c *webRTCConn) Write(b []byte) (int, error) { - c.SendData(b) + c.sendData(b) return len(b), nil } @@ -63,7 +63,64 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { return fmt.Errorf("SetWriteDeadline not implemented") } -func (c *webRTCConn) PreparePeerConnection() { +func NewWebRTCConnection(config *webrtc.Configuration, + broker *BrokerChannel) *webRTCConn { + connection := new(webRTCConn) + connection.config = config + connection.broker = broker + connection.offerChannel = make(chan *webrtc.SessionDescription) + connection.answerChannel = make(chan *webrtc.SessionDescription) + connection.writeChannel = make(chan []byte) + connection.errorChannel = make(chan error) + connection.reset = make(chan struct{}) + + // Log every few seconds. + connection.BytesInfo = &BytesInfo{ + inboundChan: make(chan int), outboundChan: make(chan int), + inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, + } + go connection.BytesInfo.Log() + + // Pipes remain the same even when DataChannel gets switched. + connection.recvPipe, connection.writePipe = io.Pipe() + + return connection +} + +// WebRTC re-establishment loop. Expected in own goroutine. +func (c *webRTCConn) ConnectLoop() { + for { + log.Println("Establishing WebRTC connection...") + // TODO: When go-webrtc is more stable, it's possible that a new + // PeerConnection won't need to be re-prepared each time. + c.preparePeerConnection() + err := c.establishDataChannel() + if err == nil { + c.sendOffer() + c.receiveAnswer() + <-c.reset + log.Println(" --- snowflake connection reset ---") + } else { + log.Println("WebRTC: Could not establish DataChannel.") + } + } +} + +// Expected in own goroutine. +func (c *webRTCConn) SendLoop() { + log.Println("send loop") + for data := range c.writeChannel { + // Flush buffer if necessary. + for c.buffer.Len() > 0 { + c.snowflake.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes") + c.buffer.Reset() + } + c.snowflake.Send(data) + } +} + +func (c *webRTCConn) preparePeerConnection() { if nil != c.pc { c.pc.Close() c.pc = nil @@ -110,7 +167,7 @@ func (c *webRTCConn) PreparePeerConnection() { } // Create a WebRTC DataChannel locally. -func (c *webRTCConn) EstablishDataChannel() error { +func (c *webRTCConn) establishDataChannel() error { dc, err := c.pc.CreateDataChannel("snowflake", webrtc.Init{}) // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the @@ -158,13 +215,14 @@ func (c *webRTCConn) EstablishDataChannel() error { // Block until an offer is available, then send it to either // the Broker or signal pipe. -func (c *webRTCConn) SendOffer() error { +func (c *webRTCConn) sendOffer() error { + log.Println("sendOffer...") select { case offer := <-c.offerChannel: if "" == brokerURL { log.Printf("Please Copy & Paste the following to the peer:") log.Printf("----------------") - fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n") + log.Printf("\n" + offer.Serialize() + "\n") log.Printf("----------------") return nil } @@ -186,7 +244,7 @@ func (c *webRTCConn) SendOffer() error { return nil } -func (c *webRTCConn) ReceiveAnswer() { +func (c *webRTCConn) receiveAnswer() { go func() { answer, ok := <-c.answerChannel if !ok || nil == answer { @@ -203,7 +261,7 @@ func (c *webRTCConn) ReceiveAnswer() { }() } -func (c *webRTCConn) SendData(data []byte) { +func (c *webRTCConn) sendData(data []byte) { c.BytesInfo.AddOutbound(len(data)) // Buffer the data in case datachannel isn't available yet. if nil == c.snowflake { @@ -214,39 +272,6 @@ func (c *webRTCConn) SendData(data []byte) { c.writeChannel <- data } -// Expected in own goroutine. -func (c *webRTCConn) SendLoop() { - log.Println("send loop") - for data := range c.writeChannel { - // Flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - } - c.snowflake.Send(data) - } -} - -// WebRTC re-establishment loop. Expected in own goroutine. -func (c *webRTCConn) ConnectLoop() { - for { - log.Println("Establishing WebRTC connection...") - // TODO: When go-webrtc is more stable, it's possible that a new - // PeerConnection won't need to be re-prepared each time. - c.PreparePeerConnection() - err := c.EstablishDataChannel() - if err == nil { - c.SendOffer() - c.ReceiveAnswer() - <-c.reset - log.Println(" --- snowflake connection reset ---") - } else { - log.Println("WebRTC: Could not establish DataChannel.") - } - } -} - func (c *webRTCConn) Reset() { go func() { c.reset <- struct{}{} // Attempt to negotiate a new datachannel..

1 0

[snowflake/master] remove webRTCConn SendLoop and simplify Write without additional channel, as net.Conn is already safe
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit d4efe774d109b094b81699a608cd1024e096bb64 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue Feb 23 17:34:51 2016 -0800 remove webRTCConn SendLoop and simplify Write without additional channel, as net.Conn is already safe --- client/client_test.go | 14 ++++++-------- client/snowflake.go | 1 - client/webrtc.go | 52 ++++++++++++++++++--------------------------------- 3 files changed, 24 insertions(+), 43 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index cad40de..9acf6fc 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -33,19 +33,17 @@ func TestConnect(t *testing.T) { } So(c.buffer.Bytes(), ShouldEqual, nil) - Convey("sendData buffers when datachannel is nil", func() { - c.sendData([]byte("test")) + Convey("Write buffers when datachannel is nil", func() { + c.Write([]byte("test")) c.snowflake = nil So(c.buffer.Bytes(), ShouldResemble, []byte("test")) }) - Convey("sendData sends to datachannel when not nil", func() { + Convey("Write sends to datachannel when not nil", func() { mock := new(MockDataChannel) - mock.done = make(chan bool) - go c.SendLoop() - c.writeChannel = make(chan []byte) c.snowflake = mock - c.sendData([]byte("test")) + mock.done = make(chan bool, 1) + c.Write([]byte("test")) <-mock.done So(c.buffer.Bytes(), ShouldEqual, nil) So(mock.destination.Bytes(), ShouldResemble, []byte("test")) @@ -54,7 +52,7 @@ func TestConnect(t *testing.T) { Convey("Receive answer sets remote description", func() { c.answerChannel = make(chan *webrtc.SessionDescription) c.config = webrtc.NewConfiguration() - c.PreparePeerConnection() + c.preparePeerConnection() c.receiveAnswer() sdp := webrtc.DeserializeSessionDescription("test") c.answerChannel <- sdp diff --git a/client/snowflake.go b/client/snowflake.go index 29d263a..615038c 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -70,7 +70,6 @@ func dialWebRTC() (*webRTCConn, error) { connection := NewWebRTCConnection(config, broker) go connection.ConnectLoop() - go connection.SendLoop() return connection, nil } diff --git a/client/webrtc.go b/client/webrtc.go index 89d1592..0c865fa 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -19,7 +19,6 @@ type webRTCConn struct { offerChannel chan *webrtc.SessionDescription answerChannel chan *webrtc.SessionDescription errorChannel chan error - writeChannel chan []byte recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer @@ -33,8 +32,15 @@ func (c *webRTCConn) Read(b []byte) (int, error) { return c.recvPipe.Read(b) } +// Writes bytes out to the snowflake proxy. func (c *webRTCConn) Write(b []byte) (int, error) { - c.sendData(b) + c.BytesInfo.AddOutbound(len(b)) + if nil == c.snowflake { + log.Printf("Buffered %d bytes --> WebRTC", len(b)) + c.buffer.Write(b) + } else { + c.snowflake.Send(b) + } return len(b), nil } @@ -64,19 +70,18 @@ func (c *webRTCConn) SetWriteDeadline(t time.Time) error { } func NewWebRTCConnection(config *webrtc.Configuration, - broker *BrokerChannel) *webRTCConn { + broker *BrokerChannel) *webRTCConn { connection := new(webRTCConn) connection.config = config connection.broker = broker - connection.offerChannel = make(chan *webrtc.SessionDescription) - connection.answerChannel = make(chan *webrtc.SessionDescription) - connection.writeChannel = make(chan []byte) - connection.errorChannel = make(chan error) - connection.reset = make(chan struct{}) + connection.offerChannel = make(chan *webrtc.SessionDescription, 1) + connection.answerChannel = make(chan *webrtc.SessionDescription, 1) + connection.errorChannel = make(chan error, 1) + connection.reset = make(chan struct{}, 1) // Log every few seconds. connection.BytesInfo = &BytesInfo{ - inboundChan: make(chan int), outboundChan: make(chan int), + inboundChan: make(chan int, 5), outboundChan: make(chan int, 5), inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, } go connection.BytesInfo.Log() @@ -106,20 +111,6 @@ func (c *webRTCConn) ConnectLoop() { } } -// Expected in own goroutine. -func (c *webRTCConn) SendLoop() { - log.Println("send loop") - for data := range c.writeChannel { - // Flush buffer if necessary. - for c.buffer.Len() > 0 { - c.snowflake.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - } - c.snowflake.Send(data) - } -} - func (c *webRTCConn) preparePeerConnection() { if nil != c.pc { c.pc.Close() @@ -185,6 +176,7 @@ func (c *webRTCConn) establishDataChannel() error { dc.Send(c.buffer.Bytes()) log.Println("Flushed", c.buffer.Len(), "bytes") c.buffer.Reset() + c.snowflake = dc } dc.OnClose = func() { @@ -198,6 +190,9 @@ func (c *webRTCConn) establishDataChannel() error { } } dc.OnMessage = func(msg []byte) { + if len(msg) <= 0 { + log.Println("0 length---") + } c.BytesInfo.AddInbound(len(msg)) n, err := c.writePipe.Write(msg) if err != nil { @@ -261,17 +256,6 @@ func (c *webRTCConn) receiveAnswer() { }() } -func (c *webRTCConn) sendData(data []byte) { - c.BytesInfo.AddOutbound(len(data)) - // Buffer the data in case datachannel isn't available yet. - if nil == c.snowflake { - log.Printf("Buffered %d bytes --> WebRTC", len(data)) - c.buffer.Write(data) - return - } - c.writeChannel <- data -} - func (c *webRTCConn) Reset() { go func() { c.reset <- struct{}{} // Attempt to negotiate a new datachannel..

1 0

[snowflake/master] rendezvous / BrokerChannel tests for client
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 5aae41c9016cb79ee4f7ccb9830ef0d08ed0ee2a Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Feb 27 14:45:53 2016 -0800 rendezvous / BrokerChannel tests for client --- client/client_test.go | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ client/rendezvous.go | 12 ++++++----- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 9acf6fc..a3fe078 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -4,6 +4,10 @@ import ( "bytes" "github.com/keroserene/go-webrtc" . "github.com/smartystreets/goconvey/convey" + "net/http" + // "net/http/httptest" + "io/ioutil" + "strings" "testing" ) @@ -21,6 +25,29 @@ func (*MockDataChannel) Close() error { return nil } +type MockResponse struct{} + +func (m *MockResponse) Read(p []byte) (int, error) { + p = []byte(`{"type":"answer","sdp":"fake"}`) + return 0, nil +} +func (m *MockResponse) Close() error { + return nil +} + +type MockTransport struct { +} + +// Just returns a response with fake SDP answer. +func (m *MockTransport) RoundTrip(req *http.Request) (*http.Response, error) { + s := ioutil.NopCloser(strings.NewReader(`{"type":"answer","sdp":"fake"}`)) + r := &http.Response{ + StatusCode: http.StatusOK, + Body: s, + } + return r, nil +} + func TestConnect(t *testing.T) { Convey("Snowflake", t, func() { @@ -72,6 +99,35 @@ func TestConnect(t *testing.T) { // TODO }) }) + }) + + Convey("Rendezvous", t, func() { + + Convey("BrokerChannel with no front domain", func() { + b := NewBrokerChannel("test.broker", "") + So(b.url, ShouldNotBeNil) + So(b.url.Path, ShouldResemble, "test.broker") + So(b.transport, ShouldNotBeNil) + }) + + Convey("BrokerChannel with front domain", func() { + b := NewBrokerChannel("test.broker", "front") + So(b.url, ShouldNotBeNil) + So(b.url.Path, ShouldResemble, "test.broker") + So(b.url.Host, ShouldResemble, "front") + So(b.transport, ShouldNotBeNil) + }) + + Convey("BrokerChannel Negotiate responds with answer", func() { + b := NewBrokerChannel("test.broker", "") + sdp := webrtc.DeserializeSessionDescription("test") + // Replace transport with a mock. + b.transport = &MockTransport{} + answer, err := b.Negotiate(sdp) + So(err, ShouldBeNil) + So(answer, ShouldNotBeNil) + So(answer.Sdp, ShouldResemble, "fake") + }) }) } diff --git a/client/rendezvous.go b/client/rendezvous.go index fe75b09..29969f0 100644 --- a/client/rendezvous.go +++ b/client/rendezvous.go @@ -18,9 +18,10 @@ import ( type BrokerChannel struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). - Host string - url *url.URL - transport http.Transport // Used to make all requests. + Host string + url *url.URL + // transport http.Transport // Used to make all requests. + transport http.RoundTripper // Used to make all requests. } // Construct a new BrokerChannel, where: @@ -41,8 +42,9 @@ func NewBrokerChannel(broker string, front string) *BrokerChannel { // We make a copy of DefaultTransport because we want the default Dial // and TLSHandshakeTimeout settings. But we want to disable the default // ProxyFromEnvironment setting. - bc.transport = *http.DefaultTransport.(*http.Transport) - bc.transport.Proxy = nil + transport := http.DefaultTransport.(*http.Transport) + transport.Proxy = nil + bc.transport = transport return bc }

1 0

[snowflake/master] update README and include TOC
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 38999e02de8bc87e5aac5ce074da2e2a9f5b9b02 Author: Serene Han <keroserene+git(a)gmail.com> Date: Wed Feb 24 07:47:17 2016 -0800 update README and include TOC --- README.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e716041..425a07d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,23 @@ -# snowflake-pt +# Snowflake [![Build Status](https://travis-ci.org/keroserene/snowflake.svg?branch=master)](http… A Pluggable Transport using WebRTC + + +**Table of Contents** + +- [Status](#status) +- [Usage](#usage) + - [Dependencies](#dependencies) + - [More Info](#more-info) + - [Building a Snowflake](#building-a-snowflake) +- [Appendix](#appendix) + - [-- Testing directly via WebRTC Server --](#---testing-directly-via-webrtc-server---) + - [-- Via Browser Proxy --](#---via-browser-proxy---) + + ### Status @@ -23,8 +37,14 @@ This should start the client plugin, bootstrapping to 100% using WebRTC. #### Dependencies +Client: - [go-webrtc](https://github.com/keroserene/go-webrtc). -- Go 1.5+ +- Go 1.5.* (1.6 is not yet supported. See [Issue #22](https://github.com/keroserene/snowflake/issues/22)) + +Proxy: +- [CoffeeScript](coffeescript.org) + +--- #### More Info

1 0

[snowflake/master] only flush datachannel with nonzero bytes, which prevents Tor from marking the SOCKS for close (#12)
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit f3e0abe0e169f6e5467aae75286ace935924370f Author: Serene Han <keroserene+git(a)gmail.com> Date: Thu Feb 25 01:23:59 2016 -0800 only flush datachannel with nonzero bytes, which prevents Tor from marking the SOCKS for close (#12) --- client/snowflake.go | 3 ++- client/webrtc.go | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 615038c..2c40796 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -101,7 +101,7 @@ func handler(conn *pt.SocksConn) error { log.Println("handler fired:", conn) remote, err := dialWebRTC() - if err != nil { + if err != nil || remote == nil { conn.Reject() return err } @@ -123,6 +123,7 @@ func handler(conn *pt.SocksConn) error { func acceptLoop(ln *pt.SocksListener) error { defer ln.Close() for { + log.Println("SOCKS listening...") conn, err := ln.AcceptSocks() if err != nil { if e, ok := err.(net.Error); ok && e.Temporary() { diff --git a/client/webrtc.go b/client/webrtc.go index 0c865fa..d60f212 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -172,11 +172,13 @@ func (c *webRTCConn) establishDataChannel() error { if nil != c.snowflake { panic("PeerConnection snowflake already exists.") } - // Flush the buffer, then enable datachannel. - dc.Send(c.buffer.Bytes()) - log.Println("Flushed", c.buffer.Len(), "bytes") - c.buffer.Reset() - + // Flush the buffer if necessary. + if c.buffer.Len() > 0 { + dc.Send(c.buffer.Bytes()) + log.Println("Flushed", c.buffer.Len(), "bytes.") + c.buffer.Reset() + } + // Then enable the datachannel. c.snowflake = dc } dc.OnClose = func() { @@ -190,6 +192,7 @@ func (c *webRTCConn) establishDataChannel() error { } } dc.OnMessage = func(msg []byte) { + // log.Println("ONMESSAGE: ", len(msg)) if len(msg) <= 0 { log.Println("0 length---") }

1 0

[snowflake/master] move endWebRTC() mostly into webRTCConn.Close()
by serene＠torproject.org 04 Mar '16

04 Mar '16

commit 5edac195f640237dffab21beffc755a588faef57 Author: Serene Han <keroserene+git(a)gmail.com> Date: Fri Feb 26 14:35:15 2016 -0800 move endWebRTC() mostly into webRTCConn.Close() --- client/snowflake.go | 18 +++++++----------- client/webrtc.go | 45 +++++++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 2c40796..25ccfef 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -46,6 +46,8 @@ func copyLoop(a, b net.Conn) { wg.Done() }() wg.Wait() + // a.Close() + // b.Close() log.Println("copy loop ended") } @@ -79,16 +81,8 @@ func endWebRTC() { if nil == webrtcRemote { return } - if nil != webrtcRemote.snowflake { - s := webrtcRemote.snowflake - webrtcRemote.snowflake = nil - log.Printf("WebRTC: closing DataChannel") - s.Close() - } - if nil != webrtcRemote.pc { - log.Printf("WebRTC: closing PeerConnection") - webrtcRemote.pc.Close() - } + webrtcRemote.Close() + webrtcRemote = nil } // Establish a WebRTC channel for SOCKS connections. @@ -116,6 +110,7 @@ func handler(conn *pt.SocksConn) error { // TODO: Make SOCKS acceptance more independent from WebRTC so they can // be more easily interchanged. copyLoop(conn, remote) + // <-remote.endChannel log.Println("----END---") return nil } @@ -123,8 +118,9 @@ func handler(conn *pt.SocksConn) error { func acceptLoop(ln *pt.SocksListener) error { defer ln.Close() for { - log.Println("SOCKS listening...") + log.Println("SOCKS listening...", ln) conn, err := ln.AcceptSocks() + log.Println("accepting", conn, err) if err != nil { if e, ok := err.(net.Error); ok && e.Temporary() { continue diff --git a/client/webrtc.go b/client/webrtc.go index d60f212..2388e9a 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -19,6 +19,7 @@ type webRTCConn struct { offerChannel chan *webrtc.SessionDescription answerChannel chan *webrtc.SessionDescription errorChannel chan error + endChannel chan struct{} recvPipe *io.PipeReader writePipe *io.PipeWriter buffer bytes.Buffer @@ -45,8 +46,25 @@ func (c *webRTCConn) Write(b []byte) (int, error) { } func (c *webRTCConn) Close() error { - // Data channel closed implicitly? - return c.pc.Close() + var err error = nil + log.Printf("WebRTC: Closing") + if nil != c.snowflake { + s := c.snowflake + c.snowflake = nil + log.Printf("WebRTC: closing DataChannel") + s.Close() + } + if nil != c.pc { + log.Printf("WebRTC: closing PeerConnection") + err = c.pc.Close() + c.pc = nil + } + close(c.offerChannel) + close(c.answerChannel) + close(c.errorChannel) + // c.writePipe.Close() + // c.recvPipe.Close() + return err } func (c *webRTCConn) LocalAddr() net.Addr { @@ -77,6 +95,7 @@ func NewWebRTCConnection(config *webrtc.Configuration, connection.offerChannel = make(chan *webrtc.SessionDescription, 1) connection.answerChannel = make(chan *webrtc.SessionDescription, 1) connection.errorChannel = make(chan error, 1) + connection.endChannel = make(chan struct{}, 1) connection.reset = make(chan struct{}, 1) // Log every few seconds. @@ -100,13 +119,13 @@ func (c *webRTCConn) ConnectLoop() { // PeerConnection won't need to be re-prepared each time. c.preparePeerConnection() err := c.establishDataChannel() - if err == nil { + if err != nil { + log.Println("WebRTC: Could not establish DataChannel.") + } else { c.sendOffer() c.receiveAnswer() <-c.reset log.Println(" --- snowflake connection reset ---") - } else { - log.Println("WebRTC: Could not establish DataChannel.") } } } @@ -172,7 +191,7 @@ func (c *webRTCConn) establishDataChannel() error { if nil != c.snowflake { panic("PeerConnection snowflake already exists.") } - // Flush the buffer if necessary. + // Flush buffered outgoing SOCKS data if necessary. if c.buffer.Len() > 0 { dc.Send(c.buffer.Bytes()) log.Println("Flushed", c.buffer.Len(), "bytes.") @@ -186,10 +205,16 @@ func (c *webRTCConn) establishDataChannel() error { // Future writes will go to the buffer until a new DataChannel is available. log.Println("WebRTC: DataChannel.OnClose") // Only reset if this OnClose was triggered remotely. - if nil != c.snowflake { - c.snowflake = nil - c.Reset() + if nil == c.snowflake { + panic("Should not have nil snowflake before closing. ") } + c.snowflake = nil + // TODO: Need a way to update the circuit so that when a new WebRTC + // data channel is available, the relay actually recognizes the new + // snowflake? + c.Reset() + // c.Close() + // c.endChannel <- struct{}{} } dc.OnMessage = func(msg []byte) { // log.Println("ONMESSAGE: ", len(msg)) @@ -214,7 +239,6 @@ func (c *webRTCConn) establishDataChannel() error { // Block until an offer is available, then send it to either // the Broker or signal pipe. func (c *webRTCConn) sendOffer() error { - log.Println("sendOffer...") select { case offer := <-c.offerChannel: if "" == brokerURL { @@ -254,6 +278,7 @@ func (c *webRTCConn) receiveAnswer() { log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err := c.pc.SetRemoteDescription(answer) if nil != err { + log.Printf("webrtc: Unable to SetRemoteDescription.") c.errorChannel <- err } }()

1 0

[tordnsel/master] make the tests compile
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit 461d2d89e915e76d4e722eb70d2973642ae3de97 Author: David Kaloper <david(a)numm.org> Date: Wed Oct 23 03:52:21 2013 +0200 make the tests compile --- src/TorDNSEL/Config/Tests.hs | 1 + src/TorDNSEL/DNS/Server/Tests.hs | 1 + src/TorDNSEL/DNS/Tests.hs | 2 +- src/TorDNSEL/Directory/Tests.hs | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/TorDNSEL/Config/Tests.hs b/src/TorDNSEL/Config/Tests.hs index 54460a0..e7b9a54 100644 --- a/src/TorDNSEL/Config/Tests.hs +++ b/src/TorDNSEL/Config/Tests.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Config.Tests diff --git a/src/TorDNSEL/DNS/Server/Tests.hs b/src/TorDNSEL/DNS/Server/Tests.hs index 2293e4b..eebea2a 100644 --- a/src/TorDNSEL/DNS/Server/Tests.hs +++ b/src/TorDNSEL/DNS/Server/Tests.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.DNS.Server.Tests diff --git a/src/TorDNSEL/DNS/Tests.hs b/src/TorDNSEL/DNS/Tests.hs index 42f7bb1..0c0eede 100644 --- a/src/TorDNSEL/DNS/Tests.hs +++ b/src/TorDNSEL/DNS/Tests.hs @@ -16,7 +16,7 @@ module TorDNSEL.DNS.Tests (tests) where import Control.Monad (replicateM) import qualified Data.ByteString as B -import qualified Data.ByteString.Base as B +import qualified Data.ByteString.Internal as B (c2w) import qualified Data.ByteString.Lazy as L import Test.HUnit (Test(..), (@=?)) diff --git a/src/TorDNSEL/Directory/Tests.hs b/src/TorDNSEL/Directory/Tests.hs index f9b8c45..66b95ba 100644 --- a/src/TorDNSEL/Directory/Tests.hs +++ b/src/TorDNSEL/Directory/Tests.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE OverloadedStrings #-} ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Tests

1 0

[tordnsel/master] reign in over the extensions
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit 1c90be2dc4d3b275f434bb4e9ea63f169ae46f3e Author: David Kaloper <david(a)numm.org> Date: Wed Sep 4 05:30:41 2013 +0200 reign in over the extensions --- src/TorDNSEL/Config/Internals.hs | 2 - src/TorDNSEL/Control/Concurrent/Link/Internals.hs | 1 - src/TorDNSEL/DNS/Internals.hs | 1 - src/TorDNSEL/DNS/Server/Internals.hs | 1 - src/TorDNSEL/Directory/Internals.hs | 2 - src/TorDNSEL/Directory/Tests.hs | 2 - src/TorDNSEL/Document.hs | 1 - src/TorDNSEL/ExitTest/Initiator/Internals.hs | 9 +-- src/TorDNSEL/ExitTest/Server/Internals.hs | 1 - src/TorDNSEL/Log/Internals.hsc | 3 +- src/TorDNSEL/Main.hsc | 2 +- src/TorDNSEL/NetworkState/Internals.hs | 1 - src/TorDNSEL/NetworkState/Storage/Internals.hs | 1 - src/TorDNSEL/Random.hs | 2 +- src/TorDNSEL/Socks/Internals.hs | 1 - src/TorDNSEL/Statistics/Internals.hs | 3 +- src/TorDNSEL/TorControl/Internals.hs | 12 +-- src/TorDNSEL/Util.hsc | 5 +- tordnsel.cabal | 99 +++++++++++++---------- 19 files changed, 64 insertions(+), 85 deletions(-) diff --git a/src/TorDNSEL/Config/Internals.hs b/src/TorDNSEL/Config/Internals.hs index 5458813..c8aa790 100644 --- a/src/TorDNSEL/Config/Internals.hs +++ b/src/TorDNSEL/Config/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns, TypeSynonymInstances, - FlexibleInstances, FlexibleContexts #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs index 8107481..cf83cba 100644 --- a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs +++ b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-ignore-asserts #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 735d7a8..b80b170 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 622de9b..8ab3637 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Directory/Internals.hs b/src/TorDNSEL/Directory/Internals.hs index 7dc1eb2..154b30c 100644 --- a/src/TorDNSEL/Directory/Internals.hs +++ b/src/TorDNSEL/Directory/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, TypeSynonymInstances, FlexibleContexts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Internals diff --git a/src/TorDNSEL/Directory/Tests.hs b/src/TorDNSEL/Directory/Tests.hs index 9a895b6..f9b8c45 100644 --- a/src/TorDNSEL/Directory/Tests.hs +++ b/src/TorDNSEL/Directory/Tests.hs @@ -1,5 +1,3 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Tests diff --git a/src/TorDNSEL/Document.hs b/src/TorDNSEL/Document.hs index 52ea9c9..50c986c 100644 --- a/src/TorDNSEL/Document.hs +++ b/src/TorDNSEL/Document.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Initiator/Internals.hs b/src/TorDNSEL/ExitTest/Initiator/Internals.hs index a63e25f..d4538df 100644 --- a/src/TorDNSEL/ExitTest/Initiator/Internals.hs +++ b/src/TorDNSEL/ExitTest/Initiator/Internals.hs @@ -1,11 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, Rank2Types #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Server/Internals.hs b/src/TorDNSEL/ExitTest/Server/Internals.hs index b6aa705..97d1f8e 100644 --- a/src/TorDNSEL/ExitTest/Server/Internals.hs +++ b/src/TorDNSEL/ExitTest/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 7c5b490..0b26873 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -1,5 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, TypeSynonymInstances, - OverlappingInstances, FlexibleInstances #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 4d4092e..e612de0 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, CPP #-} +{-# LANGUAGE ForeignFunctionInterface, CPP #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-missing-fields -fno-warn-orphans #-} diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 32b4a42..c42cae7 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/NetworkState/Storage/Internals.hs b/src/TorDNSEL/NetworkState/Storage/Internals.hs index fd9a04b..79481f6 100644 --- a/src/TorDNSEL/NetworkState/Storage/Internals.hs +++ b/src/TorDNSEL/NetworkState/Storage/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Random.hs b/src/TorDNSEL/Random.hs index 69c254d..a9f5a8c 100644 --- a/src/TorDNSEL/Random.hs +++ b/src/TorDNSEL/Random.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables #-} +{-# LANGUAGE ForeignFunctionInterface #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index d6c91f7..f514c44 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-unused-binds #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index e24c745..cc0f799 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE BangPatterns #-} -{-# OPTIONS_GHC -fglasgow-exts -fno-warn-type-defaults #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/TorControl/Internals.hs b/src/TorDNSEL/TorControl/Internals.hs index dba1e85..2ea2e16 100644 --- a/src/TorDNSEL/TorControl/Internals.hs +++ b/src/TorDNSEL/TorControl/Internals.hs @@ -1,13 +1,5 @@ -{-# LANGUAGE PatternGuards, MultiParamTypeClasses, ExistentialQuantification, - FlexibleContexts, FlexibleInstances, - DeriveDataTypeable #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# LANGUAGE ExistentialQuantification #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index 89837cd..57ada86 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -1,7 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, - TypeSynonymInstances, OverlappingInstances, - UndecidableInstances, FlexibleInstances, MultiParamTypeClasses, - GeneralizedNewtypeDeriving, FlexibleContexts #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances, UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-orphans -Wwarn #-} -- ^^^^^^ -- XXX: findSubstrings is deprecated diff --git a/tordnsel.cabal b/tordnsel.cabal index 23fa628..7e8d015 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -1,71 +1,84 @@ Name: TorDNSEL Version: 0.1.1-dev Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes -Description: TorDNSEL implements a design for a DNSBL-style interface for - detecting connections exiting the Tor network. This design and its rationale - is described at <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt>. +Description: + TorDNSEL implements a design for a DNSBL-style interface for detecting + connections exiting the Tor network. This design and its rationale is + described at + <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt>. License: PublicDomain License-File: LICENSE Homepage: http://p56soo2ibjkx23xo.onion/ -Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.… +Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.… Author: tup Maintainer: tup.tuple(a)googlemail.com, lunar(a)debian.org, andrew(a)torproject.org Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, - time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, - containers>=0.1, deepseq >= 1.3 + time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, + containers>=0.1, deepseq >= 1.3 Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, - contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 + contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 Executable: tordnsel Main-Is: tordnsel.hs -Other-Modules: TorDNSEL.Config, - TorDNSEL.Config.Internals, - TorDNSEL.Control.Concurrent.Link, - TorDNSEL.Control.Concurrent.Link.Internals, - TorDNSEL.Control.Concurrent.Util, - TorDNSEL.Directory, - TorDNSEL.Directory.Internals, - TorDNSEL.DistinctQueue, - TorDNSEL.DNS, - TorDNSEL.DNS.Internals, - TorDNSEL.DNS.Server, - TorDNSEL.DNS.Server.Internals, - TorDNSEL.Document, - TorDNSEL.ExitTest.Initiator, - TorDNSEL.ExitTest.Initiator.Internals, - TorDNSEL.ExitTest.Request, - TorDNSEL.ExitTest.Server, - TorDNSEL.ExitTest.Server.Internals, - TorDNSEL.Log, - TorDNSEL.Log.Internals, - TorDNSEL.Main, - TorDNSEL.NetworkState, - TorDNSEL.NetworkState.Internals, - TorDNSEL.NetworkState.Storage, - TorDNSEL.NetworkState.Storage.Internals, - TorDNSEL.NetworkState.Types, - TorDNSEL.Random, - TorDNSEL.Socks, - TorDNSEL.Socks.Internals, - TorDNSEL.Statistics, - TorDNSEL.Statistics.Internals, - TorDNSEL.TorControl, - TorDNSEL.TorControl.Internals, +Other-Modules: TorDNSEL.Config + TorDNSEL.Config.Internals + TorDNSEL.Control.Concurrent.Link + TorDNSEL.Control.Concurrent.Link.Internals + TorDNSEL.Control.Concurrent.Util + TorDNSEL.Directory + TorDNSEL.Directory.Internals + TorDNSEL.DistinctQueue + TorDNSEL.DNS + TorDNSEL.DNS.Internals + TorDNSEL.DNS.Server + TorDNSEL.DNS.Server.Internals + TorDNSEL.Document + TorDNSEL.ExitTest.Initiator + TorDNSEL.ExitTest.Initiator.Internals + TorDNSEL.ExitTest.Request + TorDNSEL.ExitTest.Server + TorDNSEL.ExitTest.Server.Internals + TorDNSEL.Log + TorDNSEL.Log.Internals + TorDNSEL.Main + TorDNSEL.NetworkState + TorDNSEL.NetworkState.Internals + TorDNSEL.NetworkState.Storage + TorDNSEL.NetworkState.Storage.Internals + TorDNSEL.NetworkState.Types + TorDNSEL.Random + TorDNSEL.Socks + TorDNSEL.Socks.Internals + TorDNSEL.Statistics + TorDNSEL.Statistics.Internals + TorDNSEL.TorControl + TorDNSEL.TorControl.Internals TorDNSEL.Util HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto GHC-Options: -O2 -Wall -Werror CPP-Options: -DVERSION="0.1.1-dev" +Extensions: FlexibleContexts + FlexibleInstances + TypeSynonymInstances + MultiParamTypeClasses + PatternGuards + BangPatterns + ViewPatterns + ScopedTypeVariables + DeriveDataTypeable + GeneralizedNewtypeDeriving + Rank2Types Executable: runtests Buildable: False Main-Is: runtests.hs -Other-Modules: TorDNSEL.Config.Tests, - TorDNSEL.Directory.Tests, - TorDNSEL.DNS.Tests, +Other-Modules: TorDNSEL.Config.Tests + TorDNSEL.Directory.Tests + TorDNSEL.DNS.Tests TorDNSEL.DNS.Server.Tests HS-Source-Dirs: src Includes: netinet/in.h, openssl/rand.h

1 0

[tordnsel/master] network-2.3 compat
by arlo＠torproject.org 04 Mar '16

04 Mar '16

commit 921f6d9889335da34271efae48e1d27dc86420fe Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 4 12:53:16 2016 -0800 network-2.3 compat --- src/TorDNSEL/Util.hsc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index beee747..89837cd 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -531,6 +531,10 @@ bindListeningUnixDomainStreamSocket sockPath mode = do listen sock sOMAXCONN return sock +-- network-2.3 compat +-- +deriving instance Ord SockAddr + -------------------------------------------------------------------------------- -- Monads

1 0