all: status as atomic.Int32 instead of core.Volatile[int]

Author: ignoramous

intra/backend/dnsx.go

@@ -61,7 +61,7 @@ const ( // see dnsx/transport.go
 
 const ( // from dnsx/queryerror.go
 	// Start: Transaction started
-	Start = iota
+	Start int32 = iota
 	// Complete : Transaction completed successfully
 	Complete
 	// SendFailed : Failed to send query
@@ -84,6 +84,8 @@ const ( // from dnsx/queryerror.go
 	Unpaused
 	// DEnd: Transport stopped
 	DEnd
+	// Unknown: Transport status is unknown
+	Unknown int32 = 100
 )
 
 const ( // from: dnsx/rethinkdns.go
@@ -105,7 +107,7 @@ type DNSTransport interface {
 	// Returns nil if there isn't any.
 	GetRelay() Proxy
 	// State of the transport after previous query (see: queryerror.go)
-	Status() int
+	Status() int32
 }
 
 type DNSTransportMult interface {

intra/backend/dnsx_listener.go

@@ -50,7 +50,7 @@ type DNSSummary struct {
 	// Relay server PID hops over, if any.
 	RPID string
 	// Transport status (Start, Complete, SendFailed, NoResponse, BadQuery, BadResponse, etc).
-	Status int
+	Status int32
 	// CSV of Rethink DNS+ blocklists (local or remote) names (if used).
 	Blocklists string
 	// Actual target (domain name) that was blocked (could be a CNAME or HTTPS/SVCB alias) by Blocklists.

intra/backend/ipn_proxies.go

@@ -231,7 +231,7 @@ type Proxy interface {
 	// DNS returns the ip:port or doh/dot url or dnscrypt stamp for this proxy.
 	DNS() string
 	// Status returns the status of this proxy.
-	Status() int
+	Status() int32
 	// Ping pings this proxy.
 	Ping() bool
 	// Pause pauses this proxy.

intra/backend/rnet_services.go

@@ -42,7 +42,7 @@ type Server interface {
 	// Addr returns the address of the server.
 	GetAddr() string
 	// Status returns the status of the server.
-	Status() int
+	Status() int32
 	// Stop stops the server.
 	Stop() error
 	// Refresh re-registers the server.

intra/bootstrap.go

@@ -314,7 +314,7 @@ func (b *bootstrap) IPPorts() []netip.AddrPort {
 	return dnsx.NoIPPort
 }
 
-func (b *bootstrap) Status() int {
+func (b *bootstrap) Status() int32 {
 	if tr := b.tr; tr != nil {
 		return tr.Status()
 	}

intra/common.go

@@ -15,6 +15,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"slices"
@@ -97,7 +98,7 @@ type baseHandler struct {
 
 	// fields below are mutable
 
-	status *core.Volatile[int] // status of this handler
+	status atomic.Int32 // status of this handler
 }
 
 var _ netstack.GBaseConnHandler = (*baseHandler)(nil)
@@ -112,8 +113,8 @@ func newBaseHandler(pctx context.Context, proto string, r dnsx.Resolver, px ipn.
 		listener:    l,
 		fwtracker:   core.NewExpiringMap[string, string](pctx, proto+".fwtrack"),
 		conntracker: core.NewConnMap(proto + ".conntrack"),
-		status:      core.NewVolatile(HDLOK),
 	}
+	h.status.Store(HDLOK)
 	context.AfterFunc(pctx, h.End)
 	return h
 }

intra/dns53/dot.go

@@ -56,7 +56,7 @@ type dot struct {
 	echlastattempt atomic.Int64               // last attempt fetching ech cfg; unix milli
 
 	est    core.P2QuantileEstimator
-	status *core.Volatile[int]
+	status atomic.Int32
 }
 
 var _ dnsx.Transport = (*dot)(nil)
@@ -109,7 +109,6 @@ func NewTLSTransport(ctx context.Context, id, rawurl string, addrs []string, px
 		skipTLSVerify: skipTLSVerify,
 		addrport:      addrport, // may or may not be ipaddr
 		port:          port,
-		status:        core.NewVolatile(x.Start),
 		proxies:       px,
 		relay:         relay,
 		relayref:      relayref,
@@ -118,6 +117,7 @@ func NewTLSTransport(ctx context.Context, id, rawurl string, addrs []string, px
 		est:           core.NewP50Estimator(ctx),
 		// echconfig/echlastattempt: zero values (nil) are fine
 	}
+	t.status.Store(dnsx.Start)
 	echcfg := t.getOrCreateEchConfigIfNeeded()
 	// local dialer: protect.MakeNsDialer(id, ctl)
 	t.c = dnsclient(tlscfg)
@@ -407,7 +407,7 @@ func (t *dot) IPPorts() (ipps []netip.AddrPort) {
 	return
 }
 
-func (t *dot) Status() int {
+func (t *dot) Status() int32 {
 	if px := t.GetRelay(); px != nil {
 		if y, to := dnsx.OverrideStatusFrom(px); y {
 			return to
@@ -417,7 +417,7 @@ func (t *dot) Status() int {
 	if s == dnsx.Paused {
 		// paused status is a pseudo state dependent on underlying relay
 		// or requested pid, not a permanent state of this transport.
-		t.status.Cas(s, dnsx.Unpaused)
+		t.status.CompareAndSwap(s, dnsx.Unpaused)
 		return dnsx.Unpaused
 	}
 	return s

intra/dns53/errorer.go

@@ -77,7 +77,7 @@ func (t *errorer) IPPorts() []netip.AddrPort {
 	return dnsx.NoIPPort
 }
 
-func (*errorer) Status() int {
+func (*errorer) Status() int32 {
 	return x.ClientError
 }
 

intra/dns53/goos.go

@@ -10,10 +10,10 @@ import (
 	"context"
 	"net"
 	"net/netip"
+	"sync/atomic"
 	"time"
 
 	x "github.com/celzero/firestack/intra/backend"
-	"github.com/celzero/firestack/intra/core"
 	"github.com/celzero/firestack/intra/dnsx"
 	"github.com/celzero/firestack/intra/ipn"
 	"github.com/celzero/firestack/intra/log"
@@ -31,7 +31,7 @@ type goosr struct {
 	// dialer *protect.RDial
 	exit ipn.Proxy // the only supported proxy is ipn.Exit
 
-	status *core.Volatile[int]
+	status atomic.Int32
 }
 
 var _ dnsx.Transport = (*goosr)(nil)
@@ -55,12 +55,12 @@ func NewGoosTransport(pctx context.Context, pxs ipn.ProxyProvider) (t *goosr, er
 	}
 	ctx, cancel := context.WithCancel(pctx)
 	tx := &goosr{
-		ctx:    ctx,
-		done:   cancel,
-		status: core.NewVolatile(x.Start),
+		ctx:  ctx,
+		done: cancel,
 		// dialer: d,
 		exit: px,
 	}
+	tx.status.Store(dnsx.Start)
 	tx.r = &net.Resolver{
 		PreferGo: true,
 		Dial:     tx.pxdial, // dials in to ipn.Exit, always
@@ -208,7 +208,7 @@ func (t *goosr) IPPorts() []netip.AddrPort {
 	return []netip.AddrPort{netip.AddrPortFrom(netip.IPv6Loopback(), uint16(53))}
 }
 
-func (t *goosr) Status() int {
+func (t *goosr) Status() int32 {
 	return t.status.Load()
 }
 

intra/dns53/grounded.go

@@ -21,7 +21,7 @@ import (
 type grounded struct {
 	id     string
 	ipport string
-	status int
+	status int32
 }
 
 var _ dnsx.Transport = (*grounded)(nil)
@@ -86,7 +86,7 @@ func (t *grounded) IPPorts() []netip.AddrPort {
 	return dnsx.NoIPPort
 }
 
-func (t *grounded) Status() int {
+func (t *grounded) Status() int32 {
 	return t.status
 }