archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 20:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

add --meek flag to client to toggle the domain fronted rendezvous

Browse source
This commit is contained in:
Serene Han 2016-01-19 17:21:07 -08:00
parent dcb901e408
commit b4a07c4192
3 changed files with 45 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

46
client/snowflake.go
View file

@ -25,14 +25,15 @@ import (
// Hard-coded meek signalling channel for now.
// TODO: expose as param
const (
MEEK_URL = "snowflake-reg.appspot.com"
FRONT_DOMAIN = "https://www.google.com"
// FRONT_DOMAIN = "https://www.google.com"
// Go fully requires the protocol to make url spec
FRONT_URL = "https://www.google.com"
BROKER_URL = "snowflake-reg.appspot.com"
)
var ptInfo pt.ClientInfo
var logFile *os.File
var offerURL string
var meekEnabled bool
// When a connection handler starts, +1 is written to this channel; when it
// ends, -1 is written.
@ -160,7 +161,6 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) (
close(openChan)
}
dc.OnMessage = func(msg []byte) {
// log.Printf("OnMessage channel %d %+q", len(msg), msg)
log.Printf("OnMessage <--- %d bytes", len(msg))
n, err := pw.Write(msg)
if err != nil {
@ -180,20 +180,22 @@ func dialWebRTC(config *webrtc.Configuration, meek *MeekChannel) (
fmt.Fprintln(logFile, "\n"+offer.Serialize()+"\n")
log.Printf("----------------")
go func() {
// log.Printf("Sending offer via meek...")
// answer, err := meek.Negotiate(pc.LocalDescription())
// if nil != err {
// log.Printf("Signalling error: %s", err)
// }
// if nil == answer {
// log.Printf("No answer received from meek channel.")
// } else {
// // TODO: Once this is correct, uncomment and remove copy-paste
// // signalling.
// log.Println("Recieved answer from Meek channel: \n",
// answer.Serialize())
// // signalChan <- answer
// }
if meekEnabled {
log.Println("Sending offer via meek channel...\nTarget URL: ", BROKER_URL,
"\nFront URL: ", FRONT_URL)
answer, err := meek.Negotiate(pc.LocalDescription())
if nil != err {
log.Printf("MeekChannel signaling error: %s", err)
}
if nil == answer {
log.Printf("MeekChannel: No answer received.")
} else {
log.Println("Recieved answer from Meek channel: \n\n",
answer.Serialize(), "\n")
// TODO: Once this is correct, uncomment and remove copy-paste stuff.
// signalChan <- answer
}
}
if offerURL != "" {
answer, err := sendOfferHTTP(offerURL, offer)
if err != nil {
@ -253,15 +255,12 @@ func handler(conn *pt.SocksConn) error {
}()
defer conn.Close()
// go func() {
// }()
// Prepare meek signalling channel.
info := NewRequestInfo(MEEK_URL, FRONT_DOMAIN)
info := NewRequestInfo(BROKER_URL, FRONT_URL)
meek := NewMeekChannel(info)
config := webrtc.NewConfiguration(
webrtc.OptionIceServer("stun:stun.l.google.com:19302"))
// remote, err := dialWebRTC(config, nil)
remote, err := dialWebRTC(config, meek)
if err != nil {
conn.Reject()
@ -322,7 +321,8 @@ func readSignalingMessages(f *os.File) {
func main() {
var err error
flag.StringVar(&offerURL, "url", "", "do signaling through URL")
flag.StringVar(&offerURL, "url", "", "do signalling through URL")
flag.BoolVar(&meekEnabled, "meek", false, "use domain fronted signaling")
flag.Parse()
logFile, err = os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)