TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/router: switch packet marks to avoid conflict with Weave Net.

Browse Source 
Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-07-22 01:24:28 +00:00
parent f26b409bd5
commit d60917c0f1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/netns/netns_linux.go
View File

@ -26,7 +26,7 @@
// //
// Keep this in sync with tailscaleBypassMark in // Keep this in sync with tailscaleBypassMark in
// wgengine/router/router_linux.go. // wgengine/router/router_linux.go.
const tailscaleBypassMark = 0x20000 const tailscaleBypassMark = 0x80000
// ipRuleOnce is the sync.Once & cached value for ipRuleAvailable. // ipRuleOnce is the sync.Once & cached value for ipRuleAvailable.
var ipRuleOnce struct { var ipRuleOnce struct {

4
wgengine/router/router_linux.go
View File

@ -37,13 +37,13 @@
const ( const (
// Packet is from Tailscale and to a subnet route destination, so // Packet is from Tailscale and to a subnet route destination, so
// is allowed to be routed through this machine. // is allowed to be routed through this machine.
tailscaleSubnetRouteMark = "0x10000" tailscaleSubnetRouteMark = "0x40000"
// Packet was originated by tailscaled itself, and must not be // Packet was originated by tailscaled itself, and must not be
// routed over the Tailscale network. // routed over the Tailscale network.
// //
// Keep this in sync with tailscaleBypassMark in // Keep this in sync with tailscaleBypassMark in
// net/netns/netns_linux.go. // net/netns/netns_linux.go.
tailscaleBypassMark = "0x20000" tailscaleBypassMark = "0x80000"
) )
// netfilterRunner abstracts helpers to run netfilter commands. It // netfilterRunner abstracts helpers to run netfilter commands. It