diff --git a/api.md b/api.md index 355c86574..1e4f60e93 100644 --- a/api.md +++ b/api.md @@ -474,7 +474,7 @@ Determines what rules match for a user on an ACL without saving the ACL to the s ###### Query Parameters `type` - can be 'user' or 'ipport' `previewFor` - if type=user, a user's email. If type=ipport, a IP address + port like "10.0.0.1:80". -The provided ACL is queried with this paramater to determine which rules match. +The provided ACL is queried with this parameter to determine which rules match. ###### POST Body ACL JSON or HuJSON (see https://tailscale.com/kb/1018/acls) diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go index 07ff950b4..bc4749c8e 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -823,7 +823,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, maxPolls int, cb func(*netm } // Get latest localPort. This might've changed if - // a lite map update occured meanwhile. This only affects + // a lite map update occurred meanwhile. This only affects // the end-to-end test. // TODO(bradfitz): remove the NetworkMap.LocalPort field entirely. c.mu.Lock() diff --git a/derp/derp_server.go b/derp/derp_server.go index 30402a332..dcb624534 100644 --- a/derp/derp_server.go +++ b/derp/derp_server.go @@ -150,7 +150,7 @@ type Server struct { // PacketForwarder is something that can forward packets. // -// It's mostly an inteface for circular dependency reasons; the +// It's mostly an interface for circular dependency reasons; the // typical implementation is derphttp.Client. The other implementation // is a multiForwarder, which this package creates as needed if a // public key gets more than one PacketForwarder registered for it. diff --git a/net/dns/resolver/tsdns.go b/net/dns/resolver/tsdns.go index bdd7b6318..7c68f962e 100644 --- a/net/dns/resolver/tsdns.go +++ b/net/dns/resolver/tsdns.go @@ -334,7 +334,7 @@ func (r *Resolver) resolveLocal(domain dnsname.FQDN, typ dns.Type) (netaddr.IP, case dns.TypeNS, dns.TypeSOA, dns.TypeAXFR, dns.TypeHINFO: return netaddr.IP{}, dns.RCodeNotImplemented - // For everything except for the few types above that are explictly not implemented, return no records. + // For everything except for the few types above that are explicitly not implemented, return no records. // This is what other DNS systems do: always return NOERROR // without any records whenever the requested record type is unknown. // You can try this with: diff --git a/net/flowtrack/flowtrack.go b/net/flowtrack/flowtrack.go index 8387145d3..4f660959b 100644 --- a/net/flowtrack/flowtrack.go +++ b/net/flowtrack/flowtrack.go @@ -49,7 +49,7 @@ type entry struct { value interface{} } -// Add adds a value to the cache, set or updating its assoicated +// Add adds a value to the cache, set or updating its associated // value. // // If MaxEntries is non-zero and the length of the cache is greater diff --git a/net/netcheck/netcheck.go b/net/netcheck/netcheck.go index ef22b38cd..12b7b9ce7 100644 --- a/net/netcheck/netcheck.go +++ b/net/netcheck/netcheck.go @@ -362,7 +362,7 @@ func makeProbePlan(dm *tailcfg.DERPMap, ifState *interfaces.State, last *Report) tries = 2 } else if hadBoth { // For dual stack machines, make the 3rd & slower nodes alternate - // beetween. + // between. if ri%2 == 0 { do4, do6 = true, false } else { diff --git a/safesocket/unixsocket.go b/safesocket/unixsocket.go index 824cf0960..bbf822f03 100644 --- a/safesocket/unixsocket.go +++ b/safesocket/unixsocket.go @@ -113,7 +113,7 @@ func socketPermissionsForOS() os.FileMode { // connectMacOSAppSandbox connects to the Tailscale Network Extension, // which is necessarily running within the macOS App Sandbox. Our // little dance to connect a regular user binary to the sandboxed -// nework extension is: +// network extension is: // // * the sandboxed IPNExtension picks a random localhost:0 TCP port // to listen on diff --git a/tstest/natlab/natlab.go b/tstest/natlab/natlab.go index 7354e52ea..d3cf76fc5 100644 --- a/tstest/natlab/natlab.go +++ b/tstest/natlab/natlab.go @@ -34,7 +34,7 @@ type Packet struct { Payload []byte // Prefix set by various internal methods of natlab, to locate - // where in the network a trace occured. + // where in the network a trace occurred. locator string } diff --git a/tsweb/tsweb.go b/tsweb/tsweb.go index 4b02ba5c6..eb59f4204 100644 --- a/tsweb/tsweb.go +++ b/tsweb/tsweb.go @@ -87,7 +87,7 @@ func AllowDebugAccess(r *http.Request) bool { } // Protected wraps a provided debug handler, h, returning a Handler -// that enforces AllowDebugAccess and returns forbiden replies for +// that enforces AllowDebugAccess and returns forbidden replies for // unauthorized requests. func Protected(h http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/util/deephash/deephash.go b/util/deephash/deephash.go index 9b5f70410..b30ccd19b 100644 --- a/util/deephash/deephash.go +++ b/util/deephash/deephash.go @@ -34,7 +34,7 @@ ) // There is much overlap between the theory of serialization and hashing. -// A hash (useful for determing equality) can be produced by printing a value +// A hash (useful for determining equality) can be produced by printing a value // and hashing the output. The format must: // * be deterministic such that the same value hashes to the same output, and // * be parsable such that the same value can be reproduced by the output. diff --git a/util/groupmember/groupmember.go b/util/groupmember/groupmember.go index 49057e0d9..9936c30c3 100644 --- a/util/groupmember/groupmember.go +++ b/util/groupmember/groupmember.go @@ -15,7 +15,7 @@ // IsMemberOfGroup verifies if the provided user is member of the provided // system group. -// If verfication fails, an error is returned. +// If verification fails, an error is returned. func IsMemberOfGroup(group, userName string) (bool, error) { return isMemberOfGroup(group, userName) } diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go index 8a6353ad6..b3e83716a 100644 --- a/wgengine/magicsock/magicsock.go +++ b/wgengine/magicsock/magicsock.go @@ -2777,7 +2777,7 @@ func (c *Conn) ParseEndpoint(endpointStr string) (conn.Endpoint, error) { de := &discoEndpoint{ c: c, publicKey: tailcfg.NodeKey(pk), // peer public key (for WireGuard + DERP) - discoKey: tailcfg.DiscoKey(discoKey), // for discovery mesages + discoKey: tailcfg.DiscoKey(discoKey), // for discovery messages discoShort: tailcfg.DiscoKey(discoKey).ShortString(), wgEndpoint: endpointStr, sentPing: map[stun.TxID]sentPing{}, @@ -3128,7 +3128,7 @@ type discoEndpoint struct { // These fields are initialized once and never modified. c *Conn publicKey tailcfg.NodeKey // peer public key (for WireGuard + DERP) - discoKey tailcfg.DiscoKey // for discovery mesages + discoKey tailcfg.DiscoKey // for discovery messages discoShort string // ShortString of discoKey fakeWGAddr netaddr.IPPort // the UDP address we tell wireguard-go we're using wgEndpoint string // string from ParseEndpoint, holds a JSON-serialized wgcfg.Endpoints @@ -3285,7 +3285,7 @@ func (de *discoEndpoint) initFakeUDPAddr() { de.fakeWGAddr = netaddr.IPPortFrom(netaddr.IPFrom16(addr), 12345) } -// isFirstRecvActivityInAwhile notes that receive activity has occured for this +// isFirstRecvActivityInAwhile notes that receive activity has occurred for this // endpoint and reports whether it's been at least 10 seconds since the last // receive activity (including having never received from this peer before). func (de *discoEndpoint) isFirstRecvActivityInAwhile() bool {