From 8783db018bf07955f160e7a85b3d08a9cad99eb3 Mon Sep 17 00:00:00 2001 From: Daniel Carrillo Date: Mon, 20 Mar 2023 17:38:29 +0100 Subject: [PATCH] Use pointers to proper server initializing handling --- server/quic_server.go | 4 ++-- server/server.go | 14 +++++++------- server/tcp_server.go | 4 ++-- server/tls_server.go | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server/quic_server.go b/server/quic_server.go index b706219..ba2fbe6 100644 --- a/server/quic_server.go +++ b/server/quic_server.go @@ -15,8 +15,8 @@ type QuicServer struct { ctx context.Context } -func NewQuicServer(ctx context.Context, tlsServer *TLSServer) QuicServer { - return QuicServer{ +func NewQuicServer(ctx context.Context, tlsServer *TLSServer) *QuicServer { + return &QuicServer{ tlsServer: tlsServer, ctx: ctx, } diff --git a/server/server.go b/server/server.go index 2d96fa6..5ce1eeb 100644 --- a/server/server.go +++ b/server/server.go @@ -24,9 +24,9 @@ type Factory struct { } func Setup(ctx context.Context, handler http.Handler) *Factory { - var tcpServer TCPServer - var tlsServer TLSServer - var quicServer QuicServer + var tcpServer *TCPServer + var tlsServer *TLSServer + var quicServer *QuicServer if setting.App.BindAddress != "" { tcpServer = NewTCPServer(ctx, &handler) @@ -35,14 +35,14 @@ func Setup(ctx context.Context, handler http.Handler) *Factory { if setting.App.TLSAddress != "" { tlsServer = NewTLSServer(ctx, &handler) if setting.App.EnableHTTP3 { - quicServer = NewQuicServer(ctx, &tlsServer) + quicServer = NewQuicServer(ctx, tlsServer) } } return &Factory{ - tcpServer: &tcpServer, - tlsServer: &tlsServer, - quicServer: &quicServer, + tcpServer: tcpServer, + tlsServer: tlsServer, + quicServer: quicServer, } } diff --git a/server/tcp_server.go b/server/tcp_server.go index 5462d6c..e2b3838 100644 --- a/server/tcp_server.go +++ b/server/tcp_server.go @@ -15,8 +15,8 @@ type TCPServer struct { ctx context.Context } -func NewTCPServer(ctx context.Context, handler *http.Handler) TCPServer { - return TCPServer{ +func NewTCPServer(ctx context.Context, handler *http.Handler) *TCPServer { + return &TCPServer{ handler: handler, ctx: ctx, } diff --git a/server/tls_server.go b/server/tls_server.go index 38da79e..4d31f0c 100644 --- a/server/tls_server.go +++ b/server/tls_server.go @@ -15,8 +15,8 @@ type TLSServer struct { ctx context.Context } -func NewTLSServer(ctx context.Context, handler *http.Handler) TLSServer { - return TLSServer{ +func NewTLSServer(ctx context.Context, handler *http.Handler) *TLSServer { + return &TLSServer{ handler: handler, ctx: ctx, }