mirror/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-04-04 06:36:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

normal control is working with hardcoded mapresponses

Browse Source
This commit is contained in:
Simeng He
2021-07-08 15:43:08 -04:00
parent 1e83b97498
commit fceffebf16
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
control/controlclient/direct.go
View File

@@ -777,8 +777,25 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
health.GotStreamedMapResponse()
}
if pr := resp.PingRequest; pr != nil && c.isUniquePingRequest(pr) {
fmt.Println("Before Ping", resp.PingRequest, c.isUniquePingRequest(resp.PingRequest))
fmt.Println("Peers :", resp.Peers, resp.PeersChanged, resp.PeersRemoved)
netmap := sess.netmapForResponse(&resp)
fmt.Println("Early Netmap : ", netmap.Peers)
if len(resp.PeersChanged) > 0 {
fmt.Printf("PEER INFO: %+v\n", resp.PeersChanged[0])
}
// if pr := resp.PingRequest; pr != nil && c.isUniquePingRequest(pr) {
// fmt.Println("Inside Ping")
// go answerPing(c.logf, c.httpc, pr)
// }
if pr := resp.PingRequest; pr != nil {
fmt.Println("Inside Ping")
go answerPing(c.logf, c.httpc, pr)
if len(netmap.Peers) > 0 {
fmt.Println("Start Custom Ping")
ip := netmap.Peers[0].Addresses[0].IP()
go c.CustomPing(&resp, ip)
}
}
if resp.KeepAlive {
@@ -819,6 +836,12 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm
return errors.New("MapResponse lacked node")
}
fmt.Println("NETMAP PEERS : ", nm.Peers)
if len(nm.Peers) > 0 {
fmt.Printf("NETMAP PEER: %+v\n", nm.Peers[0].Addresses)
}
fmt.Println("NETMAP SELF : ", nm.SelfNode.Addresses)
// Temporarily (2020-06-29) support removing all but
// discovery-supporting nodes during development, for
// less noise.
@@ -1190,6 +1213,7 @@ func (c *Direct) isUniquePingRequest(pr *tailcfg.PingRequest) bool {
}
func answerPing(logf logger.Logf, c *http.Client, pr *tailcfg.PingRequest) {
fmt.Println("Running Ping")
if pr.URL == "" {
logf("invalid PingRequest with no URL")
return
@@ -1213,6 +1237,7 @@ func answerPing(logf logger.Logf, c *http.Client, pr *tailcfg.PingRequest) {
} else if pr.Log {
logf("answerPing complete to %v (after %v)", pr.URL, d)
}
fmt.Println("Ping Done")
}
func sleepAsRequested(ctx context.Context, logf logger.Logf, timeoutReset chan<- struct{}, d time.Duration) error {
@@ -1292,3 +1317,18 @@ func (c *Direct) SetDNS(ctx context.Context, req *tailcfg.SetDNSRequest) error {
return nil
}
// Run the ping suite from this client to another one
// Send the ping results via http to the adminhttp handlers.
// This is where we hopefully will run the ping suite similar to CLI
func (c *Direct) CustomPing(mr *tailcfg.MapResponse, ip netaddr.IP) bool {
start := time.Now()
c.pinger.Ping(ip, true, func(res *ipnstate.PingResult) {
fmt.Printf("Callback Nodename : %v, NODEIP : %v, duration : %v\n", res.NodeName, res.NodeIP, res.LatencySeconds)
})
duration := time.Since(start)
// Send the data to the handler in api.go admin/api/ping
fmt.Printf("Ping operation took %f seconds\n", duration.Seconds())
return len(mr.Peers) > 0
}

1
ipn/ipnlocal/local.go
View File

@@ -838,6 +838,7 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
DiscoPublicKey: discoPublic,
DebugFlags: debugFlags,
LinkMonitor: b.e.GetLinkMonitor(),
Pinger: b.e,
// Don't warn about broken Linux IP forwading when
// netstack is being used.