mirror of
https://github.com/tailscale/tailscale.git
synced 2024-11-26 11:35:35 +00:00
171ec9f8f4
From integration tests elsewhere: panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x70 pc=0x845c9b] goroutine 226 [running]: tailscale.com/control/controlclient.(*Direct).sendMapRequest(0xc00053e1e0, 0x16670f0, 0xc000353780, 0xffffffffffffffff, 0xc0003e5f10, 0x0, 0x0) /home/runner/go/pkg/mod/tailscale.com@v1.1.1-0.20210715222212-1bb6abc604c1/control/controlclient/direct.go:803 +0x19bb tailscale.com/control/controlclient.(*Direct).PollNetMap(...) /home/runner/go/pkg/mod/tailscale.com@v1.1.1-0.20210715222212-1bb6abc604c1/control/controlclient/direct.go:574 tailscale.com/control/controlclient.(*Auto).mapRoutine(0xc00052a1e0) /home/runner/go/pkg/mod/tailscale.com@v1.1.1-0.20210715222212-1bb6abc604c1/control/controlclient/auto.go:464 +0x571 created by tailscale.com/control/controlclient.(*Auto).Start /home/runner/go/pkg/mod/tailscale.com@v1.1.1-0.20210715222212-1bb6abc604c1/control/controlclient/auto.go:151 +0x65 exit status 2 Also remove types/opt.Bool API addition which is now unnecessary. Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
76 lines
1.6 KiB
Go
76 lines
1.6 KiB
Go
// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package opt defines optional types.
|
|
package opt
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
)
|
|
|
|
// Bool represents an optional boolean to be JSON-encoded.
|
|
// The string can be empty (for unknown or unspecified), or
|
|
// "true" or "false".
|
|
type Bool string
|
|
|
|
func (b *Bool) Set(v bool) {
|
|
*b = Bool(strconv.FormatBool(v))
|
|
}
|
|
|
|
func (b *Bool) Clear() { *b = "" }
|
|
|
|
func (b Bool) Get() (v bool, ok bool) {
|
|
if b == "" {
|
|
return
|
|
}
|
|
v, err := strconv.ParseBool(string(b))
|
|
return v, err == nil
|
|
}
|
|
|
|
// EqualBool reports whether b is equal to v.
|
|
// If b is empty or not a valid bool, it reports false.
|
|
func (b Bool) EqualBool(v bool) bool {
|
|
p, ok := b.Get()
|
|
return ok && p == v
|
|
}
|
|
|
|
var (
|
|
trueBytes = []byte("true")
|
|
falseBytes = []byte("false")
|
|
nullBytes = []byte("null")
|
|
)
|
|
|
|
func (b Bool) MarshalJSON() ([]byte, error) {
|
|
switch b {
|
|
case "true":
|
|
return trueBytes, nil
|
|
case "false":
|
|
return falseBytes, nil
|
|
case "":
|
|
return nullBytes, nil
|
|
}
|
|
return nil, fmt.Errorf("invalid opt.Bool value %q", string(b))
|
|
}
|
|
|
|
func (b *Bool) UnmarshalJSON(j []byte) error {
|
|
// Note: written with a bunch of ifs instead of a switch
|
|
// because I'm sure the Go compiler optimizes away these
|
|
// []byte->string allocations in an == comparison, but I'm too
|
|
// lazy to check whether that's true in a switch also.
|
|
if string(j) == "true" {
|
|
*b = "true"
|
|
return nil
|
|
}
|
|
if string(j) == "false" {
|
|
*b = "false"
|
|
return nil
|
|
}
|
|
if string(j) == "null" {
|
|
*b = ""
|
|
return nil
|
|
}
|
|
return fmt.Errorf("invalid opt.Bool value %q", j)
|
|
}
|