From 4157171b7f0e1630953303f535774e6c2186490b Mon Sep 17 00:00:00 2001 From: Raymond Hill Date: Sun, 25 Dec 2022 08:54:18 -0500 Subject: [PATCH] Use "constant" property for target hntrie container --- src/js/static-net-filtering.js | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js index 561338ed3..0504d6f95 100644 --- a/src/js/static-net-filtering.js +++ b/src/js/static-net-filtering.js @@ -1736,10 +1736,6 @@ class FilterDomainHitSet { // - from= class FilterFromDomainHit extends FilterDomainHit { - static get hntrieContainer() { - return origHNTrieContainer; - } - static hasOriginHit() { return true; } @@ -1756,6 +1752,9 @@ class FilterFromDomainHit extends FilterDomainHit { details.fromDomains.push(this.getDomainOpt(idata)); } } +Object.defineProperty(FilterFromDomainHit, 'hntrieContainer', { + value: origHNTrieContainer +}); class FilterFromDomainMiss extends FilterFromDomainHit { static hasOriginHit() { @@ -1788,10 +1787,6 @@ class FilterFromEntityMiss extends FilterFromDomainMiss { } class FilterFromDomainHitSet extends FilterDomainHitSet { - static get hntrieContainer() { - return origHNTrieContainer; - } - static hasOriginHit() { return true; } @@ -1810,6 +1805,9 @@ class FilterFromDomainHitSet extends FilterDomainHitSet { details.fromDomains.push(this.getDomainOpt(idata)); } } +Object.defineProperty(FilterFromDomainHitSet, 'hntrieContainer', { + value: origHNTrieContainer +}); class FilterFromDomainMissSet extends FilterFromDomainHitSet { static hasOriginHit() { @@ -1855,10 +1853,6 @@ const compileFromDomainOpt = (...args) => { // - to= class FilterToDomainHit extends FilterDomainHit { - static get hntrieContainer() { - return destHNTrieContainer; - } - static getMatchTarget() { return $requestHostname; } @@ -1871,6 +1865,9 @@ class FilterToDomainHit extends FilterDomainHit { details.toDomains.push(this.getDomainOpt(idata)); } } +Object.defineProperty(FilterToDomainHit, 'hntrieContainer', { + value: destHNTrieContainer +}); class FilterToDomainMiss extends FilterToDomainHit { static get dnrConditionName() { @@ -1899,10 +1896,6 @@ class FilterToEntityMiss extends FilterToDomainMiss { } class FilterToDomainHitSet extends FilterDomainHitSet { - static get hntrieContainer() { - return destHNTrieContainer; - } - static getMatchTarget(which) { return (which & 0b01) !== 0 ? $requestHostname @@ -1917,6 +1910,9 @@ class FilterToDomainHitSet extends FilterDomainHitSet { details.toDomains.push(this.getDomainOpt(idata)); } } +Object.defineProperty(FilterToDomainHitSet, 'hntrieContainer', { + value: destHNTrieContainer +}); class FilterToDomainMissSet extends FilterToDomainHitSet { static match(idata) {