mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

temp

This commit is contained in:
Kevin Liang 2024-04-24 12:42:43 +00:00
parent 22fc7da2dd
commit 9420f24215
3 changed files with 9 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
appc/appconnector.go
View File

@ -115,6 +115,8 @@ func (e *AppConnector) RouteInfo() *routeinfo.RouteInfo {
// then update local routes of routeInfo in store as the current advertised routes.
func (e *AppConnector) RecreateRouteInfoFromStore(localRoutes []netip.Prefix) {
e.queue.Add(func() {
e.mu.Lock()
defer e.mu.Unlock()
ri := e.RouteInfo()
err := e.routeAdvertiser.StoreRouteInfo(ri)
if err != nil {
@ -140,6 +142,8 @@ func (e *AppConnector) UpdateRouteInfo(ri *routeinfo.RouteInfo) {
func (e *AppConnector) UnadvertiseRemoteRoutes() {
e.queue.Add(func() {
e.mu.Lock()
defer e.mu.Unlock()
e.routeAdvertiser.AdvertiseRouteInfo(nil)
})
}
@ -219,16 +223,9 @@ func (e *AppConnector) updateRoutes(routes []netip.Prefix) {
}
var routeInfo *routeinfo.RouteInfo
var err error
e.routeInfo.Control = routes
if e.ShouldStoreRoutes {
routeInfo = e.RouteInfo()
if err != nil {
if err != ipn.ErrStateNotExist {
e.logf("Appc: Unsuccessful Read RouteInfo: ", err)
}
routeInfo = routeinfo.NewRouteInfo()
}
routeInfo.Control = routes
e.routeAdvertiser.StoreRouteInfo(e.routeInfo)
}
@ -402,53 +399,10 @@ func (e *AppConnector) findRoutedDomainLocked(domain string, cnameChain map[stri
return domain, isRouted
}
// // scheduleAdvertisement schedules an advertisement of the given address
// // associated with the given domain.
// func (e *AppConnector) scheduleAdvertisement(domain string, routes ...netip.Prefix) {
// e.queue.Add(func() {
// if err := e.routeAdvertiser.AdvertiseRoute(routes...); err != nil {
// e.logf("failed to advertise routes for %s: %v: %v", domain, routes, err)
// return
// }
// e.mu.Lock()
// defer e.mu.Unlock()
// for _, route := range routes {
// if !route.IsSingleIP() {
// continue
// }
// addr := route.Addr()
// if !e.hasDomainAddrLocked(domain, addr) {
// e.addDomainAddrLocked(domain, addr)
// e.logf("[v2] advertised route for %v: %v", domain, addr)
// }
// }
// })
// }
// func (e *AppConnector) scheduleUnadvertisement(domain string, routes ...netip.Prefix) {
// e.queue.Add(func() {
// if err := e.routeAdvertiser.UnadvertiseRoute(routes...); err != nil {
// e.logf("failed to unadvertise routes for %s: %v: %v", domain, routes, err)
// return
// }
// e.mu.Lock()
// defer e.mu.Unlock()
// for _, route := range routes {
// if !route.IsSingleIP() {
// continue
// }
// addr := route.Addr()
// // e.deleteDomainAddrLocked(domain, addr)
// e.logf("[v2] unadvertised route for %v: %v", domain, addr)
// }
// })
// }
func (e *AppConnector) scheduleAdvertiseRouteInfo(ri *routeinfo.RouteInfo) {
e.queue.Add(func() {
e.mu.Lock()
defer e.mu.Unlock()
e.routeAdvertiser.AdvertiseRouteInfo(ri)
})
}

BIN
cmd/tailscaled/__debug_bin
View File

Binary file not shown.

18
ipn/ipnlocal/local.go
View File

@ -3630,8 +3630,6 @@ func (b *LocalBackend) authReconfig() {
// If the current node is an app connector, ensure the app connector machine is started
b.reconfigAppConnectorLocked(nm, prefs)
b.mu.Unlock()
fmt.Println("kevin -- try lock1", b.mu.TryLock())
b.mu.Unlock()
if blocked {
b.logf("[v1] authReconfig: blocked, skipping.")
return
@ -3644,8 +3642,6 @@ func (b *LocalBackend) authReconfig() {
b.logf("[v1] authReconfig: skipping because !WantRunning.")
return
}
fmt.Println("kevin -- try lock2", b.mu.TryLock())
b.mu.Unlock()
var flags netmap.WGConfigFlags
if prefs.RouteAll() {
@ -3660,8 +3656,6 @@ func (b *LocalBackend) authReconfig() {
flags &^= netmap.AllowSubnetRoutes
}
}
fmt.Println("kevin -- try lock3", b.mu.TryLock())
b.mu.Unlock()
// Keep the dialer updated about whether we're supposed to use
// an exit node's DNS server (so SOCKS5/HTTP outgoing dials
// can use it for name resolution)
@ -3676,11 +3670,8 @@ func (b *LocalBackend) authReconfig() {
b.logf("wgcfg: %v", err)
return
}
fmt.Println("kevin -- try lock 4", b.mu.TryLock())
b.mu.Unlock()
oneCGNATRoute := shouldUseOneCGNATRoute(b.logf, b.sys.ControlKnobs(), version.OS())
fmt.Println("kevin -- try lock 5", b.mu.TryLock())
b.mu.Unlock()
rcfg := b.routerConfig(cfg, prefs, oneCGNATRoute)
err = b.e.Reconfig(cfg, rcfg, dcfg)
@ -4172,14 +4163,11 @@ func peerRoutes(logf logger.Logf, peers []wgcfg.Peer, cgnatThreshold int) (route
// routerConfig produces a router.Config from a wireguard config and IPN prefs.
func (b *LocalBackend) routerConfig(cfg *wgcfg.Config, prefs ipn.PrefsView, oneCGNATRoute bool) *router.Config {
fmt.Println("kevin -- try lock 6", b.mu.TryLock())
b.mu.Unlock()
singleRouteThreshold := 10_000
if oneCGNATRoute {
singleRouteThreshold = 1
}
fmt.Println("kevin -- try lock 7", b.mu.TryLock())
b.mu.Unlock()
b.mu.Lock()
netfilterKind := b.capForcedNetfilter // protected by b.mu
b.mu.Unlock()
@ -6209,7 +6197,6 @@ var ErrDisallowedAutoRoute = errors.New("route is not allowed")
// If the route is disallowed, ErrDisallowedAutoRoute is returned.
func (b *LocalBackend) AdvertiseRouteInfo(ri *routeinfo.RouteInfo) {
b.mu.Lock()
defer b.mu.Unlock()
pref := b.pm.CurrentPrefs()
newRoutes := pref.AdvertiseRoutes().AsSlice()
oldHi := b.hostinfo
@ -6249,6 +6236,7 @@ func (b *LocalBackend) AdvertiseRouteInfo(ri *routeinfo.RouteInfo) {
if !oldHi.Equal(newHi) {
b.doSetHostinfoFilterServices()
}
b.mu.Unlock()
b.authReconfig()
}