TUN-3500: Integrate replace h2mux by http2 work with multiple origin support

connection/h2mux.go

@@ -22,7 +22,6 @@ const (
 type h2muxConnection struct {
 	config      *Config
 	muxerConfig *MuxerConfig
-	originURL   string
 	muxer       *h2mux.Muxer
 	// connectionID is only used by metrics, and prometheus requires labels to be string
 	connIndexStr string
@@ -54,7 +53,6 @@ func (mc *MuxerConfig) H2MuxerConfig(h h2mux.MuxedStreamHandler, logger logger.S
 func NewH2muxConnection(ctx context.Context,
 	config *Config,
 	muxerConfig *MuxerConfig,
-	originURL string,
 	edgeConn net.Conn,
 	connIndex uint8,
 	observer *Observer,
@@ -62,7 +60,6 @@ func NewH2muxConnection(ctx context.Context,
 	h := &h2muxConnection{
 		config:       config,
 		muxerConfig:  muxerConfig,
-		originURL:    originURL,
 		connIndexStr: uint8ToString(connIndex),
 		connIndex:    connIndex,
 		observer:     observer,
@@ -188,7 +185,7 @@ func (h *h2muxConnection) ServeStream(stream *h2mux.MuxedStream) error {
 }
 
 func (h *h2muxConnection) newRequest(stream *h2mux.MuxedStream) (*http.Request, error) {
-	req, err := http.NewRequest("GET", h.originURL, h2mux.MuxedStreamReader{MuxedStream: stream})
+	req, err := http.NewRequest("GET", "http://localhost:8080", h2mux.MuxedStreamReader{MuxedStream: stream})
 	if err != nil {
 		return nil, errors.Wrap(err, "Unexpected error from http.NewRequest")
 	}

connection/http2.go

@@ -7,7 +7,6 @@ import (
 	"math"
 	"net"
 	"net/http"
-	"net/url"
 	"strings"
 	"sync"
 
@@ -31,7 +30,6 @@ type HTTP2Connection struct {
 	conn          net.Conn
 	server        *http2.Server
 	config        *Config
-	originURL     *url.URL
 	namedTunnel   *NamedTunnelConfig
 	connOptions   *tunnelpogs.ConnectionOptions
 	observer      *Observer
@@ -44,7 +42,6 @@ type HTTP2Connection struct {
 func NewHTTP2Connection(
 	conn net.Conn,
 	config *Config,
-	originURL *url.URL,
 	namedTunnelConfig *NamedTunnelConfig,
 	connOptions *tunnelpogs.ConnectionOptions,
 	observer *Observer,
@@ -57,7 +54,6 @@ func NewHTTP2Connection(
 			MaxConcurrentStreams: math.MaxUint32,
 		},
 		config:        config,
-		originURL:     originURL,
 		namedTunnel:   namedTunnelConfig,
 		connOptions:   connOptions,
 		observer:      observer,
@@ -83,9 +79,6 @@ func (c *HTTP2Connection) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	c.wg.Add(1)
 	defer c.wg.Done()
 
-	r.URL.Scheme = c.originURL.Scheme
-	r.URL.Host = c.originURL.Host
-
 	respWriter := &http2RespWriter{
 		r: r.Body,
 		w: w,