Merge pull request #168 from ngrok/euan/less-raw-ptr

internal/tunnel/client: unsafe.Pointer -> atomic.Pointer

internal/tunnel/client/reconnecting.go

@@ -5,7 +5,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
 	log "github.com/inconshreveable/log15/v3"
 	"github.com/jpillora/backoff"
@@ -18,19 +17,19 @@ var ErrSessionNotReady = errors.New("an ngrok tunnel session has not yet been es
 
 // Wraps a RawSession so that it can be safely swapped out
 type swapRaw struct {
-	raw unsafe.Pointer
+	raw atomic.Pointer[RawSession]
 }
 
 func (s *swapRaw) get() RawSession {
-	ptr := atomic.LoadPointer(&s.raw)
+	ptr := s.raw.Load()
 	if ptr == nil {
 		return nil
 	}
-	return *(*RawSession)(ptr)
+	return *ptr
 }
 
 func (s *swapRaw) set(raw RawSession) {
-	atomic.StorePointer(&s.raw, unsafe.Pointer(&raw))
+	s.raw.Store(&raw)
 }
 
 func (s *swapRaw) Auth(id string, extra proto.AuthExtra) (resp proto.AuthResp, err error) {

session.go

@@ -16,7 +16,6 @@ import (
 	"strings"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
 	"github.com/inconshreveable/log15/v3"
 	"go.uber.org/multierr"
@@ -804,7 +803,7 @@ func Connect(ctx context.Context, opts ...ConnectOption) (Session, error) {
 }
 
 type sessionImpl struct {
-	raw unsafe.Pointer
+	raw atomic.Pointer[sessionInner]
 }
 
 type sessionInner struct {
@@ -825,15 +824,11 @@ type sessionInner struct {
 }
 
 func (s *sessionImpl) inner() *sessionInner {
-	ptr := atomic.LoadPointer(&s.raw)
-	if ptr == nil {
-		return nil
-	}
-	return (*sessionInner)(ptr)
+	return s.raw.Load()
 }
 
 func (s *sessionImpl) setInner(raw *sessionInner) {
-	atomic.StorePointer(&s.raw, unsafe.Pointer(raw))
+	s.raw.Store(raw)
 }
 
 func (s *sessionImpl) closeTunnel(clientID string, err error) error {
@@ -850,7 +845,6 @@ func (s *sessionImpl) Warnings() []error {
 		return []error{(*AgentVersionDeprecated)(deprecated)}
 	}
 	return nil
-
 }
 
 func (s *sessionImpl) Listen(ctx context.Context, cfg config.Tunnel) (Tunnel, error) {