ipn/wg: pause new pid if existing is paused

Author: ignoramous

intra/ipn/proxies.go

@@ -343,11 +343,18 @@ func (px *proxifier) add(p Proxy) (ok bool) {
 	defer px.Unlock()
 
 	defer func() {
-		if ok {
-			core.Go2("pxr.add: "+id, px.obs.OnProxyAdded, id, hdl)
+		if ok { // added
+			core.Go2("pxr.add."+id, px.obs.OnProxyAdded, id, hdl)
 			// new proxy, invoke Stop on old proxy
 			if old != nil && !Same(old, p) {
-				// holding px.lock, so exec stop in a goroutine
+				// change status with px lock held, so we know no other
+				// conflicting id is being added/got at the same time
+				st := old.Status()
+				if st == TPU {
+					didpause := p.Pause()
+					log.I("proxy: add: %s (%s => %s); new proxy paused? %t", id, idhandle(old), idhandle(p), didpause)
+				}
+				// do not hold px.lock, exec stop in a goroutine
 				core.Go("pxr.add.stop: "+id, func() {
 					if oldVia, _ := old.Router().Via(); oldVia != nil {
 						px.Hop(oldVia.ID(), id)

intra/ipn/proxy.go

@@ -116,7 +116,7 @@ func (pxr *proxifier) addRpnProxy(acc RpnAcc, cc string) (Proxy, *x.RpnServer, e
 	rpnid := typ + cc
 
 	// TODO: addProxy may update wg in-place, even if DNS addrs have changed
-	p, err := pxr.forceAddProxy(rpnid, txt)
+	p, err := pxr.addProxy(rpnid, txt)
 	if p == nil {
 		pxr.postAddRpnProxyError(acc) // remove from pxr.rp if exists
 		return nil, srv, core.JoinErr(err, errAddProxy)
@@ -191,7 +191,7 @@ func (pxr *proxifier) addProxy(id, txt string) (p Proxy, err error) {
 	return pxr.addOrUpdateProxy(id, txt, false /*force*/)
 }
 
-func (pxr *proxifier) addOrUpdateProxy(id, txt string, force bool) (p Proxy, err error) {
+func (pxr *proxifier) addOrUpdateProxy(id, txt string, forceAdd bool) (p Proxy, err error) {
 	if len(id) <= 0 {
 		return nil, errAddProxy
 	}
@@ -207,7 +207,7 @@ func (pxr *proxifier) addOrUpdateProxy(id, txt string, force bool) (p Proxy, err
 		pxr.RLock()
 		lp := pxr.lp
 		pxr.RUnlock()
-		if force {
+		if forceAdd {
 			p, err = NewWgProxy(pxr.ctx, id, pxr.ctl, pxr, lp, txt)
 		} else if p, _ = pxr.proxyFor(id); p != nil {
 			hdl := hdlstr(p)
@@ -227,7 +227,7 @@ func (pxr *proxifier) addOrUpdateProxy(id, txt string, force bool) (p Proxy, err
 				log.W("proxy: add: update not ok for wg(%s@%s); readd...", id, hdl)
 			}
 		}
-		if !force && p == nil {
+		if !forceAdd && p == nil {
 			// txt is both wg ifconfig and peercfg
 			p, err = NewWgProxy(pxr.ctx, id, pxr.ctl, pxr, lp, txt)
 		}
@@ -260,17 +260,17 @@ func (pxr *proxifier) addOrUpdateProxy(id, txt string, force bool) (p Proxy, err
 
 	if err != nil {
 		log.P("proxy: add: %s failed; cfg: %v", id, txt)
-		log.W("proxy: add: %s failed; force? %t; err: %v", id, force, err)
+		log.W("proxy: add: %s failed; force? %t; err: %v", id, forceAdd, err)
 		return nil, err
 	} else if p == nil {
 		log.P("proxy: add: %s nil; cfg: %v", id, txt)
-		log.W("proxy: add: %s nil; force? %t; txt: %d", id, force, len(txt))
+		log.W("proxy: add: %s nil; force? %t; txt: %d", id, forceAdd, len(txt))
 		return nil, errAddProxy
 	} else if ok := pxr.add(p); !ok {
 		return nil, errAddProxy
 	}
 
-	log.I("proxy: add: force? %t; done %s@%s/%s/%s", force, idstr(p), hdlstr(p), typstr(p), p.GetAddr())
+	log.I("proxy: add: force? %t; done %s@%s/%s/%s", forceAdd, idstr(p), hdlstr(p), typstr(p), p.GetAddr())
 	return
 }
 

intra/ipn/rpn.go

@@ -356,6 +356,7 @@ func (r *rpnp) fork(cc string) (x.Proxy, error) {
 
 	log.I("proxy: rpn: fork: %s[%s]", provider, cc)
 
+	// forked proxy must start paused if existing is paused
 	// re-adds + updates if the proxy already exists
 	kid, srv, err := r.pxr.addRpnProxy(acc, cc)
 

intra/ipn/wgproxy.go

@@ -514,6 +514,7 @@ func (w *wgproxy) update(id, txt string) (ok bool) {
 	}
 
 	if opts.willreplacepeers {
+		// Must remove current remote endpoint and add new ones
 		log.W("proxy: wg: update(%s<>%s): peers will be replaced", id, w.who())
 	}
 
@@ -553,6 +554,7 @@ func (w *wgproxy) update(id, txt string) (ok bool) {
 		log.W("proxy: updating wg(%s<>%s) ipcset; err %v", id, w.who(), ipcerr)
 		return anew
 	}
+	// wgconn, if paused, must remain paused
 	// w.Device is assumed to be Up? Send an EventDown first?
 	w.events <- tun.EventUp // re-apply interface config to wg device
 	w.uapicfg.Store(txt)    // persist the updated UAPI peer config
@@ -1765,6 +1767,7 @@ func (h *wgtun) listener(op wg.PktDir, err error) (ended bool) {
 			h.latestWrite.Store(now)
 		}
 	} else { // ok
+		// if s is TNT, ignore zero len reads / writes as TOK?
 		s = TOK
 		why = "TOK: ok"
 		if op == wg.Rcv { // read ok