net/{interfaces,netmon}, all: merge net/interfaces package into net/netmon #11901
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
... in prep for merging the net/interfaces package into net/netmon. This is a no-op change that updates a bunch of the API signatures ahead of a future change to actually move things (and remove the type alias) Updates tailscale/corp#10910 Updates tailscale/corp#18960 Updates #7967 Updates #3299 Change-Id: I477613388f09389214db0d77ccf24a65bff2199c Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
bradfitz
force-pushed
the
bradfitz/interface_into_netmon_step1_alias
branch
3 times, most recently
from
991383b
to
5ea166d
Compare
maisem
approved these changes
Apr 28, 2024
| @@ -389,7 +388,7 @@ const numIncrementalRegions = 3 | |||
|
|
|||
| // makeProbePlan generates the probe plan for a DERPMap, given the most | |||
| // recent report and whether IPv6 is configured on an interface. | |||
| func makeProbePlan(dm *tailcfg.DERPMap, ifState *interfaces.State, last *Report) (plan probePlan) { | |||
| func makeProbePlan(dm *tailcfg.DERPMap, ifState *netmon.State, last *Report) (plan probePlan) { | |||
There was a problem hiding this comment.
Maybe rename to netmon.InterfaceState?
There was a problem hiding this comment.
Part of the motivation of the move is that interfaces.State isn't just interface state, though... it also has routing state: the default route. And maybe more in the future (folding in the net/routetable stuff?). So just "State" (network state... interfaces + routes + whatever else) seemed fitting. And shorter.
…etmon In prep for most of the package funcs in net/interfaces to become methods in a long-lived netmon.Monitor that can cache things. (Many of the funcs are very heavy to call regularly, whereas the long-lived netmon.Monitor can subscribe to things from the OS and remember answers to questions it's asked regularly later) Updates tailscale/corp#10910 Updates tailscale/corp#18960 Updates #7967 Updates #3299 Change-Id: Ie4e8dedb70136af2d611b990b865a822cd1797e5 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
bradfitz
force-pushed
the
bradfitz/interface_into_netmon_step1_alias
branch
from
5ea166d
to
e04e877
Compare
kari-ts
added a commit
to tailscale/tailscale-android
that referenced
this pull request
May 1, 2024
Update net/interfaces to netmon per tailscale/tailscale#11901 Signed-off-by: kari-ts <kari@tailscale.com>
kari-ts
added a commit
to tailscale/tailscale-android
that referenced
this pull request
May 2, 2024
Update net/interfaces to netmon per tailscale/tailscale#11901 Signed-off-by: kari-ts <kari@tailscale.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In prep for most of the package funcs in net/interfaces to become
methods in a long-lived netmon.Monitor that can cache things. (Many
of the funcs are very heavy to call regularly, whereas the long-lived
netmon.Monitor can subscribe to things from the OS and remember
answers to questions it's asked regularly later)
Updates tailscale/corp#10910
Updates tailscale/corp#18960
Updates #7967
Updates #3299