backend/ipn_proxies: m go bind errs on int32

Author: ignoramous

intra/backend/ipn_proxies.go

@@ -75,7 +75,7 @@ type Router interface {
 	// MTU returns the MTU of this router.
 	MTU() (int, error)
 	// Stats returns the stats of this router.
-	Stats() Stats
+	Stat() *Stats
 	// Contains returns true if this router can route ipprefix.
 	Contains(ipprefix string) bool
 }
@@ -97,8 +97,8 @@ type Stats struct {
 	Addr   string // address of the router
 	Rx     int64  // bytes received
 	Tx     int64  // bytes transmitted
-	ErrRx  int32  // receive errors
-	ErrTx  int32  // transmit errors
+	ErrRx  int64  // receive errors
+	ErrTx  int64  // transmit errors
 	LastRx int64  // last receive in millis
 	LastTx int64  // last transmit in millis
 	LastOK int64  // last handshake or ping or connect millis

intra/ipn/proxies.go

@@ -145,7 +145,7 @@ func (nofwd) Accept(network, local string) (protect.Listener, error) {
 func (w *gw) IP4() bool            { return w.ok }
 func (w *gw) IP6() bool            { return w.ok }
 func (w *gw) MTU() (int, error)    { return NOMTU, errNoMtu }
-func (w *gw) Stats() x.Stats       { return w.stats }
+func (w *gw) Stat() *x.Stats       { return &w.stats }
 func (w *gw) Contains(string) bool { return w.ok }
 
 func NewProxifier(c protect.Controller, o x.ProxyListener) Proxies {
@@ -309,23 +309,24 @@ func (px *proxifier) MTU() (out int, err error) {
 }
 
 // Implements Router.
-func (px *proxifier) Stats() x.Stats {
+func (px *proxifier) Stat() *x.Stats {
 	px.RLock()
 	defer px.RUnlock()
 
-	var s x.Stats
+	var s *x.Stats
 	for _, p := range px.p {
 		if local(p.ID()) {
 			continue
 		}
 		if r := p.Router(); r != nil {
-			s = accStats(s, r.Stats())
+			s = accStats(s, r.Stat())
 		}
 	}
 	return s
 }
 
-func accStats(a, b x.Stats) (c x.Stats) {
+func accStats(a, b *x.Stats) (c *x.Stats) {
+	c = new(x.Stats)
 	c.Tx = a.Tx + b.Tx
 	c.Rx = a.Rx + b.Rx
 	c.ErrRx = a.ErrRx + b.ErrRx

intra/ipn/wgproxy.go

@@ -89,8 +89,8 @@ type wgtun struct {
 	since          int64                       // uptime in unix millis
 	latestRx       int64                       // last rx time in unix millis
 	latestTx       int64                       // last tx time in unix millis
-	errRx          int32                       // rx error count
-	errTx          int32                       // tx error count
+	errRx          int64                       // rx error count
+	errTx          int64                       // tx error count
 }
 
 type wgconn interface {
@@ -665,7 +665,7 @@ func (tun *wgtun) Close() error {
 
 // Implements Router.
 // TODO: use wgtun as a receiver for Stats()
-func (w *wgproxy) Stats() (out x.Stats) {
+func (w *wgproxy) Stat() (out *x.Stats) {
 	if w.status == END {
 		return
 	}
@@ -677,6 +677,7 @@ func (w *wgproxy) Stats() (out x.Stats) {
 	}
 
 	stat := wg.ReadStats(w.id, cfg)
+	out = new(x.Stats)
 	out.Rx = stat.TotalRx()
 	out.Tx = stat.TotalTx()
 	out.LastOK = stat.LatestRecentHandshake()