ipn,rpn: impl Has(ccOrId) bool

Author: ignoramous

intra/backend/ipn_proxies.go

@@ -255,6 +255,8 @@ type RpnProxy interface {
 	PingAll() (csvpids string, err error)
 	// Purge removes proxy for country code, cc.
 	Purge(cc string) bool
+	// Has returns true if a proxy for country code, cc, has been forked.
+	Has(cc string) bool
 	// Get returns proxy for country code, cc.
 	Get(cc string) (Proxy, error)
 	// Kids returns RpnServers describing all forked kids, excluding the main proxy.
@@ -321,6 +323,8 @@ type Proxies interface {
 	AddProxy(id, url string) (Proxy, error)
 	// Remove removes a transport from this multi-transport.
 	RemoveProxy(id string) bool
+	// HasProxy returns true if a proxy with the given id is registered.
+	HasProxy(id string) bool
 	// GetProxy returns a transport from this multi-transport.
 	GetProxy(id string) (Proxy, error)
 	// TestHop returns empty diag if origin can hop to via,

intra/ipn/proxies.go

@@ -848,7 +848,13 @@ func (px *proxifier) GetProxy(id string) (x.Proxy, error) {
 	return px.ProxyFor(id)
 }
 
-// TestHop implements Proxies.
+// Has implements x.Proxies.
+func (px *proxifier) HasProxy(id string) bool {
+	p, err := px.proxyFor(id)
+	return err == nil && p != nil && core.IsNotNil(p)
+}
+
+// TestHop implements x.Proxies.
 func (px *proxifier) TestHop(via, origin string) string {
 	defer core.Recover(core.Exit11, "pxr.TestHop."+via+">>"+origin)
 	if err := px.hop(via, origin, true /*dryrun*/); err != nil {

intra/ipn/rpn.go

@@ -272,6 +272,7 @@ func (r *rpnp) Probe(network, local string) (protect.PacketConn, error) {
 // Emplace implements RpnProxy.
 func (r *rpnp) Emplace(new Proxy) (err error) {
 	if new == nil {
+		// TODO: main RpnServer information must be reverted to prev?
 		log.W("proxy: rpn: emplace: no-op as new proxy nil")
 		return errRpnBadEmplace
 	}
@@ -329,13 +330,14 @@ func (r *rpnp) fork(cc string) (x.Proxy, error) {
 		// re-forking main proxy (which may not be multi-country acc) via Update() => forkAll()
 		log.I("proxy: rpn: fork: %s main cc %s; re-adding...", provider, cc)
 		// expect Emplace to be called
-		kid, srv, err := r.pxr.addRpnProxy(acc, cc) // re-generates conf and re-adds
-		if kid != nil && core.IsNotNil(kid) {
+		mp, ms, err := r.pxr.addRpnProxy(acc, cc) // re-generates conf and re-adds
+		// see: Emplace (and errBadEmplace)
+		if mp != nil && core.IsNotNil(mp) {
 			r.mu.Lock()
-			r.s = srv
+			r.s = ms
 			r.mu.Unlock()
 		}
-		return kid, err
+		return mp, err
 	}
 
 	// check main's status if not forking main
@@ -586,6 +588,32 @@ func (r *rpnp) get(cc string) (Proxy, error) {
 	return r.pxr.rpnProxyFor(provider, cc)
 }
 
+// Has implements RpnProxy.
+func (r *rpnp) Has(cc string) bool {
+	acc := r.RpnAcc
+	provider := acc.ProviderID()
+
+	// strip ProviderID prefix if present (see get)
+	cc, _ = strings.CutPrefix(cc, provider)
+	cc = strings.ToUpper(cc)
+
+	r.mu.RLock()
+	main := r.p
+	_, gotCC := r.kids[cc]
+	r.mu.RUnlock()
+
+	mainpid := idstr(main)
+
+	if provider+cc == mainpid ||
+		cc == mainpid ||
+		(cc == noCountryForOldMen && !acc.MultiCountry()) ||
+		(cc == anyCountryCode && acc.MultiCountry()) {
+		return main != nil && core.IsNotNil(main)
+	}
+
+	return gotCC
+}
+
 // Kids implements x.RpnProxy.
 func (r *rpnp) Kids() x.RpnServers {
 	r.mu.RLock()

intra/ipn/rpn/yegor.go

@@ -1170,7 +1170,8 @@ func (a *WsClient) Conf(cc string) (string, *x.RpnServer, error) {
 		cc = cccsv[1]
 	}
 	// in sync with anyCountryCode / noCountryForOldMen vars in proxy.go
-	chooseAny := cc == "**" || len(cc) <= 0
+	anycc := "**"
+	chooseAny := cc == anycc || len(cc) <= 0
 	hasCity := len(city) > 0
 	cc = strings.ToUpper(cc)
 
@@ -1267,6 +1268,10 @@ reconf:
 		r := rand.IntN(len(out))
 		log.I("ws: conf: cc %s(%s): %d/%d => chosen (any? %t): %d[%s/%s] (port: %s)",
 			cc, city, c, len(out), chooseAny, r, srvs[r].City, srvs[r].CC, portstr)
+		// change key to "any"
+		if chooseAny {
+			srvs[r].Key = anycc
+		}
 		return out[r], &srvs[r], nil
 	}
 	if xl > 0 && (tot == 0 || v <= xl) { // fail open if all CCs excluded