Routing tried every PNI (rank 1) before any IX port (rank 2), like a local-pref above peering, so a PNI in London pulled New York's traffic across the Atlantic even with the same network at the New York IX. PNIs now route at rank 2 with the IX ports, nearest first. At the same distance the PNI goes first: an IX port counts as PNI_TIE (0.001) further away, far below any link weight (at least 1). Distances compare as (Da-Db)+(dta-dtb) so exits at one distance stay exactly equal, and the POP-local shortcut skips lists that mix PNIs and IX ports. Backup only and RouteScript's prefer pni keep their say. The traceroute, the reference allocation in the tests and the RouteScript help follow.
27 lines
1.8 KiB
JavaScript
27 lines
1.8 KiB
JavaScript
// Deliberately scan all exits for every flow, without byRank, local-city
|
|
// shortcuts or first-group selection. Stable sorting preserves E order on ties.
|
|
// Without Auto-TE, an exit whose shortest path from this POP is already full fits nothing, so it counts as
|
|
// unusable, like a full exit (#210).
|
|
module.exports = `
|
|
// A carrier's own port (dr) is also a plain transit exit. A POP with a Prefer-marked transit port keeps what Prefer
|
|
// says, and a port not set to carry only takes its own POP's traffic.
|
|
const PH=new Set(E.filter(x=>x.k==='t'&&x.pref==='high').map(x=>CIDX[x.city]));
|
|
const dr=(e,ci,n)=>{if(e.k!=='t'||PH.has(ci)||eff(e,n)!==3)return 0;const t=directTier(e.net,n);return t?DIRECT_RANK[t][e.carry?0:1]:0;};
|
|
// An IX port counts as a hair further than a PNI in the same place (#298).
|
|
const tie=e=>e.k==='ix'?PNI_TIE:0;
|
|
for(const pass of PASSES)for(const rank of RANKS){
|
|
for(F=0;F<NF;F++){fci=FCI[F];fnj=FNJ[F];const n=NET_IDS[fnj];
|
|
if(FREM[F]<=1e-6||(rank===0&&!FCA[F])||(pass===1&&!FBZ[F])||(pass===2&&FBZ[F]))continue;
|
|
Dv=SDi[fci];Pv=SPi[fci];PP=walked[fci]||(walked[fci]=[]);vis++;
|
|
const candidates=E.filter(e=>e.used<e.cap&&e.ok(n)&&
|
|
((TR?eff(e,n):base(e,n))===rank||(dr(e,fci,n)||-1)===rank)&&
|
|
(rank!==DIRECT_RANK[1][1]&&rank!==DIRECT_RANK[2][1]||CIDX[e.city]===fci)&&Dv[CIDX[e.city]]<Infinity&&!gone(e))
|
|
.sort((a,b)=>(a.pref==='high'?0:1)-(b.pref==='high'?0:1)||Dv[CIDX[a.city]]-Dv[CIDX[b.city]]+(tie(a)-tie(b)));
|
|
for(let i=0;i<candidates.length&&FREM[F]>1e-6;){
|
|
let j=i+1;while(j<candidates.length&&(candidates[j].pref==='high')===(candidates[i].pref==='high')&&
|
|
Math.abs(Dv[CIDX[candidates[j].city]]-Dv[CIDX[candidates[i].city]]+(tie(candidates[j])-tie(candidates[i])))<1e-6)j++;
|
|
sendGroup(candidates.slice(i,j));i=j;
|
|
}
|
|
}
|
|
}
|
|
`;
|