Viktor Liu 76d73548d6 Fix more conflicts

2025-03-10 18:46:01 +01:00

..

common

[client] Ignore candidates that are part of the the wireguard subnet (#3472)

2025-03-10 13:59:21 +01:00

conntrack

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

forwarder

Fix forwarder IP source/destination (#3463)

2025-03-10 14:55:07 +01:00

log

Fix log format

2025-02-28 20:24:23 +01:00

allow_netbird_windows.go

fix missing method

2025-03-09 19:03:57 +01:00

allow_netbird.go

sync changes from #3426

2025-03-09 18:48:48 +01:00

localip_test.go

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

localip.go

Replace net.IP with netip.Addr (#3425)

2025-03-05 18:28:05 +01:00

rule.go

[client, management] Add port forwarding (#3275)

2025-03-09 16:06:43 +01:00

tracer_test.go

Fix more conflicts

2025-03-10 18:46:01 +01:00

tracer.go

Align packet tracer behavior with actual code paths (#3424)

2025-03-07 14:03:45 +01:00

uspfilter_bench_test.go

Merge branch 'main' into feature/flow

2025-03-09 17:42:16 +01:00

uspfilter_filter_test.go

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

uspfilter_test.go

Merge branch 'main' into feature/flow

2025-03-10 18:30:45 +01:00

uspfilter.go

[client, management] Add port forwarding (#3275)

2025-03-09 16:06:43 +01:00