From e744537b8074b6e1a40bd5e1b007b4093d7e0650 Mon Sep 17 00:00:00 2001
From: lucifer9 <lucifer@koredump.org>
Date: Thu, 27 Jun 2019 14:21:40 +0800
Subject: [PATCH] add server-side http2 over tcp (h2c) support

---
 transport/internet/http/hub.go | 78 +++++++++++++++++++++++-----------
 1 file changed, 54 insertions(+), 24 deletions(-)

diff --git a/transport/internet/http/hub.go b/transport/internet/http/hub.go
index 1ec53c5d4..f2d9fdbfe 100644
--- a/transport/internet/http/hub.go
+++ b/transport/internet/http/hub.go
@@ -16,6 +16,9 @@ import (
 	"v2ray.com/core/common/signal/done"
 	"v2ray.com/core/transport/internet"
 	"v2ray.com/core/transport/internet/tls"
+
+	"golang.org/x/net/http2"
+	"golang.org/x/net/http2/h2c"
 )
 
 type Listener struct {
@@ -104,34 +107,61 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
 
 	config := tls.ConfigFromStreamSettings(streamSettings)
 	if config == nil {
-		return nil, newError("TLS must be enabled for http transport.").AtWarning()
-	}
+		// return nil, newError("TLS must be enabled for http transport.").AtWarning()
+		h2s:=&http2.Server{}
 
-	server := &http.Server{
-		Addr:              serial.Concat(address, ":", port),
-		TLSConfig:         config.GetTLSConfig(tls.WithNextProto("h2")),
-		Handler:           listener,
-		ReadHeaderTimeout: time.Second * 4,
-	}
-
-	listener.server = server
-	go func() {
-		tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{
-			IP:   address.IP(),
-			Port: int(port),
-		}, streamSettings.SocketSettings)
-		if err != nil {
-			newError("failed to listen on", address, ":", port).Base(err).WriteToLog(session.ExportIDToError(ctx))
-			return
+		server := &http.Server{
+			Addr:              serial.Concat(address, ":", port),
+			// TLSConfig:         config.GetTLSConfig(tls.WithNextProto("h2")),
+			Handler:            h2c.NewHandler(listener,h2s),
+			ReadHeaderTimeout: time.Second * 4,
 		}
 
-		err = server.ServeTLS(tcpListener, "", "")
-		if err != nil {
-			newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx))
-		}
-	}()
+		listener.server = server
+		go func() {
+			tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{
+				IP:   address.IP(),
+				Port: int(port),
+			}, streamSettings.SocketSettings)
+			if err != nil {
+				newError("failed to listen on", address, ":", port).Base(err).WriteToLog(session.ExportIDToError(ctx))
+				return
+			}
 
-	return listener, nil
+			err = server.Serve(tcpListener)
+			if err != nil {
+				newError("stoping serving H2C").Base(err).WriteToLog(session.ExportIDToError(ctx))
+			}
+		}()
+
+		return listener, nil
+	} else {
+		server := &http.Server{
+			Addr:              serial.Concat(address, ":", port),
+			TLSConfig:         config.GetTLSConfig(tls.WithNextProto("h2")),
+			Handler:           listener,
+			ReadHeaderTimeout: time.Second * 4,
+		}
+
+		listener.server = server
+		go func() {
+			tcpListener, err := internet.ListenSystem(ctx, &net.TCPAddr{
+				IP:   address.IP(),
+				Port: int(port),
+			}, streamSettings.SocketSettings)
+			if err != nil {
+				newError("failed to listen on", address, ":", port).Base(err).WriteToLog(session.ExportIDToError(ctx))
+				return
+			}
+
+			err = server.ServeTLS(tcpListener, "", "")
+			if err != nil {
+				newError("stoping serving TLS").Base(err).WriteToLog(session.ExportIDToError(ctx))
+			}
+		}()
+
+		return listener, nil
+	}
 }
 
 func init() {