From 860898b733f8120510ae52c25568f057f3f77b4f Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Fri, 8 Jan 2016 18:44:35 -0800 Subject: [PATCH] Log answer --- .gitignore | 2 +- client/torrc | 2 +- server/snowflake.go | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d84176b..1ce46ad 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,6 @@ *.swm .DS_Store datadir/ -client/snowflake +client/client server/server snowflake.log diff --git a/client/torrc b/client/torrc index 79717ef..63c88a4 100644 --- a/client/torrc +++ b/client/torrc @@ -1,5 +1,5 @@ UseBridges 1 DataDirectory datadir -ClientTransportPlugin snowflake exec ./snowflake +ClientTransportPlugin snowflake exec ./client Bridge snowflake 0.0.3.0:1 diff --git a/server/snowflake.go b/server/snowflake.go index b6bfcee..cedea4d 100644 --- a/server/snowflake.go +++ b/server/snowflake.go @@ -125,6 +125,11 @@ func makePeerConnection(config *webrtc.Configuration) (*webrtc.PeerConnection, e log.Println("OnDataChannel") datachannelHandler(&webRTCConn{pc: pc, dc: dc}) } + pc.OnIceComplete = func() { + log.Printf("----------------") + fmt.Fprintln(logFile, pc.LocalDescription().Serialize()) + log.Printf("----------------") + } return pc, nil } @@ -138,6 +143,7 @@ func readSignalingMessages(signalChan chan *webrtc.SessionDescription, f *os.Fil continue } signalChan <- sdp + continue } if err := s.Err(); err != nil { log.Printf("signal FIFO: %s", err) @@ -165,14 +171,14 @@ func listenWebRTC(config *webrtc.Configuration, signal string) (*os.File, error) if err != nil { return nil, err } - defer signalFile.Close() + //defer signalFile.Close() var signalChan = make(chan *webrtc.SessionDescription) go func() { for { select { - case sdp := <- signalChan: + case sdp := <-signalChan: pc, err := makePeerConnection(config) if err != nil { log.Printf("makePeerConnection: %s", err) @@ -222,7 +228,8 @@ func main() { pt.SmethodError(bindaddr.MethodName, err.Error()) break } - pt.Smethod(bindaddr.MethodName, nil) + bindaddr.Addr.Port = 12345 // lies!!! + pt.Smethod(bindaddr.MethodName, bindaddr.Addr) listeners = append(listeners, ln) default: pt.SmethodError(bindaddr.MethodName, "no such method")