Delete gotfo and fastopen

Makefile

@@ -7,11 +7,9 @@ version=$(shell ver=$$(git log -n 1 --pretty=oneline --format=%D | awk -F, '{pri
  echo $$ver)
 
 client: 
- go get github.com/cbeuw/gotfo
  go build -ldflags "-X main.version=${version}" -o ./build/gq-client ./cmd/gq-client 
 
 server: 
- go get github.com/cbeuw/gotfo
  go build -ldflags "-X main.version=${version}" -o ./build/gq-server ./cmd/gq-server
 
 all: client server

cmd/gq-server/gq-server.go

@@ -1,5 +1,3 @@
-// +build go1.8,!go1.10
-
 package main
 
 import (
@@ -14,7 +12,6 @@ import (
  "time"
 
  "github.com/cbeuw/GoQuiet/gqserver"
- "github.com/cbeuw/gotfo"
 )
 
 var version string
@@ -112,8 +109,8 @@ func dispatchConnection(conn net.Conn, sta *gqserver.State) {
  go pair.remoteToServer()
  go pair.serverToRemote()
  }
- goSS := func(data []byte) {
- pair, err := makeSSPipe(conn, sta, data)
+ goSS := func() {
+ pair, err := makeSSPipe(conn, sta)
  if err != nil {
  log.Fatalf("Making connection to ss-server: %v\n", err)
  }
@@ -163,15 +160,8 @@ func dispatchConnection(conn net.Conn, sta *gqserver.State) {
  }
  }
 
- // If FastOpen is enabled, we need some data ready to send to ss-server
- if sta.FastOpen {
- tempBuf := make([]byte, 20480)
- i, _ = gqserver.ReadTillDrain(conn, tempBuf)
- data = gqserver.PeelRecordLayer(tempBuf[:i])
- goSS(data)
- } else {
- goSS(nil)
- }
+ goSS()
+
 }
 
 func makeWebPipe(remote net.Conn, sta *gqserver.State) (*webPair, error) {
@@ -186,8 +176,8 @@ func makeWebPipe(remote net.Conn, sta *gqserver.State) (*webPair, error) {
  return pair, nil
 }
 
-func makeSSPipe(remote net.Conn, sta *gqserver.State, data []byte) (*ssPair, error) {
- conn, err := gotfo.Dial(sta.SS_LOCAL_HOST+":"+sta.SS_LOCAL_PORT, sta.FastOpen, data)
+func makeSSPipe(remote net.Conn, sta *gqserver.State) (*ssPair, error) {
+ conn, err := net.Dial("tcp", sta.SS_LOCAL_HOST+":"+sta.SS_LOCAL_PORT)
  if err != nil {
  return &ssPair{}, errors.New("Connection to SS server failed")
  }
@@ -273,7 +263,7 @@ func main() {
  go usedRandomCleaner(sta)
 
  listen := func(addr, port string) {
- listener, err := gotfo.Listen(addr+":"+port, sta.FastOpen)
+ listener, err := net.Listen("tcp", addr+":"+port)
  log.Println("Listening on " + addr + ":" + port)
  if err != nil {
  log.Fatal(err)

config/gqclient.json

@@ -2,6 +2,5 @@
  "ServerName":"www.bing.com",
  "Key":"exampleconftest",
  "TicketTimeHint":3600,
- "Browser":"chrome",
- "FastOpen":true
+ "Browser":"chrome"
 }

config/gqserver.json

@@ -1,5 +1,4 @@
 {
  "WebServerAddr":"204.79.197.200:443",
- "Key":"exampleconftest",
- "FastOpen":true
+ "Key":"exampleconftest"
 }

gqclient/state.go

@@ -26,7 +26,6 @@ type State struct {
  AESKey []byte
  ServerName string
  Browser string
- FastOpen bool
 }
 
 // semi-colon separated value. This is for Android plugin options
@@ -46,9 +45,9 @@ func ssvToJson(ssv string) (ret []byte) {
  sp := strings.SplitN(ln, "=", 2)
  key := sp[0]
  value := sp[1]
- // JSON doesn't like quotation marks around int and boolean
+ // JSON doesn't like quotation marks around int
  // Yes this is extremely ugly but it's still better than writing a tokeniser
- if key == "TicketTimeHint" || key == "FastOpen" {
+ if key == "TicketTimeHint" {
  ret = append(ret, []byte("\""+key+"\":"+value+",")...)
  } else {
  ret = append(ret, []byte("\""+key+"\":\""+value+"\",")...)

gqserver/state.go

@@ -25,7 +25,6 @@ type State struct {
  SS_LOCAL_PORT string
  SS_REMOTE_HOST string
  SS_REMOTE_PORT string
- FastOpen bool
  M sync.RWMutex
  UsedRandom map[[32]byte]int
 }