fix: receive proxy protocol (#130)

haveachin · Mar 10, 2022 · b43977f · b43977f
1 parent 84ca696
commit b43977f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmd/infrared/main.go b/cmd/infrared/main.go
@@ -2,11 +2,12 @@ package main
 
 import (
 	"flag"
-	"github.com/haveachin/infrared/api"
 	"log"
 	"os"
 	"strconv"
 
+	"github.com/haveachin/infrared/api"
+
 	"github.com/haveachin/infrared"
 )
 
@@ -105,7 +106,7 @@ func main() {
 		}
 	}()
 
-	gateway := infrared.Gateway{}
+	gateway := infrared.Gateway{ReceiveProxyProtocol: receiveProxyProtocol}
 	go func() {
 		for {
 			cfg, ok := <-outCfgs

diff --git a/gateway.go b/gateway.go
@@ -23,11 +23,11 @@ var (
 )
 
 type Gateway struct {
+	ReceiveProxyProtocol bool
 	listeners            sync.Map
 	Proxies              sync.Map
 	closed               chan bool
 	wg                   sync.WaitGroup
-	receiveProxyProtocol bool
 }
 
 func (gateway *Gateway) ListenAndServe(proxies []*Proxy) error {
@@ -180,7 +180,7 @@ func (gateway *Gateway) listenAndServe(listener Listener, addr string) error {
 
 func (gateway *Gateway) serve(conn Conn, addr string) error {
 	connRemoteAddr := conn.RemoteAddr()
-	if gateway.receiveProxyProtocol {
+	if gateway.ReceiveProxyProtocol {
 		header, err := proxyproto.Read(conn.Reader())
 		if err != nil {
 			return err

diff --git a/gateway_test.go b/gateway_test.go
@@ -417,7 +417,7 @@ func TestProxyProtocol(t *testing.T) {
 			go func(wg *sync.WaitGroup) {
 				config := createProxyProtocolConfig(tc.portEnd, tc.proxyproto)
 				gateway := Gateway{
-					receiveProxyProtocol: tc.receiveProxyproto,
+					ReceiveProxyProtocol: tc.receiveProxyproto,
 				}
 				proxies := configToProxies(config)
 				if err := gateway.ListenAndServe(proxies); err != nil {