Merge branch 'develop' into freebsd

config/defaults_freebsd.go

@@ -0,0 +1,3 @@
+package config
+
+const DefaultTunName = "nc0"

config/defaults_other.go

@@ -0,0 +1,5 @@
+// +build !freebsd
+
+package config
+
+const DefaultTunName = "nc%d"

tcp/flow.go

@@ -112,10 +112,6 @@ func (f *InitiatedFlow) Reconnect(ctx context.Context) error {
 		return err
 	}
 
-	if err := conn.SetWriteBuffer(0); err != nil {
-		return err
-	}
-
 	f.conn = conn
 	f.isAlive = true
 

tcp/listener.go

@@ -25,10 +25,6 @@ func NewListener(ctx context.Context, p *proxy.Proxy, local string, v func() pro
 				panic(err)
 			}
 
-			if err := conn.SetWriteBuffer(0); err != nil {
-				panic(err)
-			}
-
 			f := NewFlowConn(ctx, conn)
 
 			log.Printf("received new tcp connection: %v\n", f)

udp/flow.go

@@ -239,8 +239,7 @@ func (f *Flow) produceInternal(ctx context.Context, v proxy.MacVerifier, mustRet
 		// adjust congestion control based on this packet's congestion header
 		f.congestion.ReceivedPacket(p.seq, p.nack, p.ack)
 
-		// 12 bytes for header + the MAC + a timestamp
-		if len(b) == 12+f.v.CodeLength()+8 {
+		if len(p.Contents()) == 0 {
 			log.Println("handled keepalive/ack only packet")
 			continue
 		}

udp/listener.go

@@ -38,11 +38,6 @@ func NewListener(ctx context.Context, p *proxy.Proxy, local string, v func() pro
 		return err
 	}
 
-	err = pconn.SetWriteBuffer(0)
-	if err != nil {
-		panic(err)
-	}
-
 	receivedConnections := make(map[ComparableUdpAddress]*Flow)
 
 	go func() {