Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/logs/launchers/listener/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package listener
import (
"fmt"
"net"
"strconv"

"github.com/DataDog/datadog-agent/pkg/util/log"

Expand Down Expand Up @@ -110,7 +111,8 @@ func (l *UDPListener) resetTailer() {
// newUDPConnection returns a new UDP connection,
// returns an error if the creation failed.
func (l *UDPListener) newUDPConnection() (*net.UDPConn, error) {
udpAddr, err := net.ResolveUDPAddr("udp", fmt.Sprintf(":%d", l.source.Config.Port))
bindAddr := net.JoinHostPort(l.source.Config.BindHost, strconv.Itoa(l.source.Config.Port))
udpAddr, err := net.ResolveUDPAddr("udp", bindAddr)
if err != nil {
return nil, err
}
Expand Down
26 changes: 26 additions & 0 deletions pkg/logs/launchers/listener/udp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package listener
import (
"fmt"
"net"
"strings"
"testing"
"time"

Expand Down Expand Up @@ -47,6 +48,31 @@ func TestUDPShouldReceiveMessage(t *testing.T) {
listener.Stop()
}

func TestUDPBindHost(t *testing.T) {
pp := mock.NewMockProvider()
msgChan := pp.NextPipelineChan()
listener, err := NewUDPListener(pp, sources.NewLogSource("", &config.LogsConfig{
Port: udpTestPort,
BindHost: "127.0.0.1",
}), 9000)
require.NoError(t, err)
listener.Start()
require.NotNil(t, listener.Conn)

addr := listener.Conn.LocalAddr().String()
assert.True(t, strings.HasPrefix(addr, "127.0.0.1:"), "expected 127.0.0.1 bind, got %s", addr)

conn, err := net.Dial("udp", addr)
require.NoError(t, err)
defer conn.Close()

fmt.Fprint(conn, "bound msg\n")
msg := <-msgChan
assert.Equal(t, "bound msg", string(msg.GetContent()))

listener.Stop()
}

func TestUDPShouldStopWhenNotStarted(t *testing.T) {
pp := mock.NewMockProvider()
listener, err := NewUDPListener(pp, sources.NewLogSource("", &config.LogsConfig{Port: udpTestPort}), 9000)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
fixes:
- |
Add new ``bind_host`` configuration option to TCP and UDP log listeners.
Comment thread
gh123man marked this conversation as resolved.
Loading