sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-12 03:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into improve-usp-fw

Browse Source 
# Conflicts:
#	client/firewall/uspfilter/conntrack/common.go
#	client/firewall/uspfilter/filter.go
#	client/firewall/uspfilter/forwarder/icmp.go
#	client/firewall/uspfilter/forwarder/tcp.go
#	client/firewall/uspfilter/nat.go
This commit is contained in:
Viktor Liu
2026-05-07 12:29:30 +02:00
parent 5506507313 205ebcfda2
commit b8707fe94d
420 changed files with 25335 additions and 10765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/ssh/proxy/proxy.go
View File

@@ -322,7 +322,7 @@ func (p *SSHProxy) directTCPIPHandler(_ *ssh.Server, _ *cryptossh.ServerConn, ne
return
}
dest := fmt.Sprintf("%s:%d", payload.DestAddr, payload.DestPort)
dest := net.JoinHostPort(payload.DestAddr, strconv.Itoa(int(payload.DestPort)))
log.Debugf("local port forwarding: %s", dest)
backendClient, err := p.getOrCreateBackendClient(sshCtx, sshCtx.User())