From 24b58663f2144eb8c90edadc550df576de0bee52 Mon Sep 17 00:00:00 2001 From: vinit-chauhan Date: Sun, 13 Oct 2024 16:58:55 -0400 Subject: [PATCH 1/3] Remove unnecessary multiplication --- filebeat/inputsource/udp/server.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index 75c74a1f3d01..4db7e1b927ec 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -20,8 +20,6 @@ package udp import ( "net" - "github.com/dustin/go-humanize" - "github.com/elastic/beats/v7/filebeat/inputsource" "github.com/elastic/beats/v7/filebeat/inputsource/common/dgram" "github.com/elastic/elastic-agent-libs/logp" @@ -48,6 +46,7 @@ func New(config *Config, callback inputsource.NetworkFunc) *Server { Timeout: config.Timeout, MaxMessageSize: config.MaxMessageSize, }) + return server } @@ -62,12 +61,11 @@ func (u *Server) createConn() (net.PacketConn, error) { if err != nil { return nil, err } - socketSize := int(u.config.ReadBuffer) * humanize.KiByte - if socketSize != 0 { - if err := listener.SetReadBuffer(int(u.config.ReadBuffer)); err != nil { - return nil, err - } + + if err := listener.SetReadBuffer(int(u.config.ReadBuffer)); err != nil { + return nil, err } + u.localaddress = listener.LocalAddr().String() return listener, err From f9453c78123dd8adebd0c2834fa742748856aa82 Mon Sep 17 00:00:00 2001 From: Vinit Chauhan Date: Sun, 13 Oct 2024 17:19:16 -0400 Subject: [PATCH 2/3] Update server.go --- filebeat/inputsource/udp/server.go | 1 - 1 file changed, 1 deletion(-) diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index 4db7e1b927ec..fae27ec314e2 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -46,7 +46,6 @@ func New(config *Config, callback inputsource.NetworkFunc) *Server { Timeout: config.Timeout, MaxMessageSize: config.MaxMessageSize, }) - return server } From b43829f61907477f1de4e8b7bbcac755e4538a0b Mon Sep 17 00:00:00 2001 From: vinit-chauhan Date: Sat, 19 Oct 2024 22:40:06 -0400 Subject: [PATCH 3/3] add if condition back. --- filebeat/inputsource/udp/server.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/filebeat/inputsource/udp/server.go b/filebeat/inputsource/udp/server.go index fae27ec314e2..3a0b429f8519 100644 --- a/filebeat/inputsource/udp/server.go +++ b/filebeat/inputsource/udp/server.go @@ -61,8 +61,10 @@ func (u *Server) createConn() (net.PacketConn, error) { return nil, err } - if err := listener.SetReadBuffer(int(u.config.ReadBuffer)); err != nil { - return nil, err + if int(u.config.ReadBuffer) != 0 { + if err := listener.SetReadBuffer(int(u.config.ReadBuffer)); err != nil { + return nil, err + } } u.localaddress = listener.LocalAddr().String()