Rename as HoldOffFrontingTunnel

Leaves HoldOffTunnelFrontingProviderIDs as legacy-only and
distinct from new HoldOffFrontingTunnel parameters.

psiphon/common/parameters/parameters.go

@@ -314,10 +314,10 @@ const (
 	HoldOffTunnelMaxDuration                           = "HoldOffTunnelMaxDuration"
 	HoldOffTunnelProtocols                             = "HoldOffTunnelProtocols"
 	HoldOffTunnelProbability                           = "HoldOffTunnelProbability"
-	HoldOffTunnelFrontingMinDuration                   = "HoldOffTunnelFrontingMinDuration"
-	HoldOffTunnelFrontingMaxDuration                   = "HoldOffTunnelFrontingMaxDuration"
-	HoldOffTunnelFrontingProviderIDs                   = "HoldOffTunnelFrontingProviderIDs"
-	HoldOffTunnelFrontingProbability                   = "HoldOffTunnelFrontingProbability"
+	HoldOffFrontingTunnelMinDuration                   = "HoldOffFrontingTunnelMinDuration"
+	HoldOffFrontingTunnelMaxDuration                   = "HoldOffFrontingTunnelMaxDuration"
+	HoldOffFrontingTunnelProviderIDs                   = "HoldOffFrontingTunnelProviderIDs"
+	HoldOffFrontingTunnelProbability                   = "HoldOffFrontingTunnelProbability"
 	RestrictFrontingProviderIDs                        = "RestrictFrontingProviderIDs"
 	RestrictFrontingProviderIDsServerProbability       = "RestrictFrontingProviderIDsServerProbability"
 	RestrictFrontingProviderIDsClientProbability       = "RestrictFrontingProviderIDsClientProbability"
@@ -821,10 +821,10 @@ var defaultParameters = map[string]struct {
 	HoldOffTunnelProtocols:   {value: protocol.TunnelProtocols{}},
 	HoldOffTunnelProbability: {value: 0.0, minimum: 0.0},
 
-	HoldOffTunnelFrontingMinDuration: {value: time.Duration(0), minimum: time.Duration(0)},
-	HoldOffTunnelFrontingMaxDuration: {value: time.Duration(0), minimum: time.Duration(0)},
-	HoldOffTunnelFrontingProviderIDs: {value: []string{}},
-	HoldOffTunnelFrontingProbability: {value: 0.0, minimum: 0.0},
+	HoldOffFrontingTunnelMinDuration: {value: time.Duration(0), minimum: time.Duration(0)},
+	HoldOffFrontingTunnelMaxDuration: {value: time.Duration(0), minimum: time.Duration(0)},
+	HoldOffFrontingTunnelProviderIDs: {value: []string{}},
+	HoldOffFrontingTunnelProbability: {value: 0.0, minimum: 0.0},
 
 	RestrictFrontingProviderIDs:                  {value: []string{}},
 	RestrictFrontingProviderIDsServerProbability: {value: 0.0, minimum: 0.0, flags: serverSideOnly},

psiphon/config.go

@@ -879,12 +879,12 @@ type Config struct {
 	HoldOffTunnelProtocols               []string
 	HoldOffTunnelProbability             *float64
 
-	// HoldOffTunnelFrontingMinDurationMilliseconds and other
-	// HoldOffTunnelFronting fields are for testing purposes.
-	HoldOffTunnelFrontingMinDurationMilliseconds *int
-	HoldOffTunnelFrontingMaxDurationMilliseconds *int
-	HoldOffTunnelFrontingProviderIDs             []string
-	HoldOffTunnelFrontingProbability             *float64
+	// HoldOffFrontingTunnelMinDurationMilliseconds and other
+	// HoldOffFrontingTunnel fields are for testing purposes.
+	HoldOffFrontingTunnelMinDurationMilliseconds *int
+	HoldOffFrontingTunnelMaxDurationMilliseconds *int
+	HoldOffFrontingTunnelProviderIDs             []string
+	HoldOffFrontingTunnelProbability             *float64
 
 	// RestrictFrontingProviderIDs and other RestrictFrontingProviderIDs fields
 	// are for testing purposes.
@@ -2236,20 +2236,20 @@ func (config *Config) makeConfigParameters() map[string]interface{} {
 		applyParameters[parameters.HoldOffTunnelProbability] = *config.HoldOffTunnelProbability
 	}
 
-	if config.HoldOffTunnelFrontingMinDurationMilliseconds != nil {
-		applyParameters[parameters.HoldOffTunnelFrontingMinDuration] = fmt.Sprintf("%dms", *config.HoldOffTunnelFrontingMinDurationMilliseconds)
+	if config.HoldOffFrontingTunnelMinDurationMilliseconds != nil {
+		applyParameters[parameters.HoldOffFrontingTunnelMinDuration] = fmt.Sprintf("%dms", *config.HoldOffFrontingTunnelMinDurationMilliseconds)
 	}
 
-	if config.HoldOffTunnelFrontingMaxDurationMilliseconds != nil {
-		applyParameters[parameters.HoldOffTunnelFrontingMaxDuration] = fmt.Sprintf("%dms", *config.HoldOffTunnelFrontingMaxDurationMilliseconds)
+	if config.HoldOffFrontingTunnelMaxDurationMilliseconds != nil {
+		applyParameters[parameters.HoldOffFrontingTunnelMaxDuration] = fmt.Sprintf("%dms", *config.HoldOffFrontingTunnelMaxDurationMilliseconds)
 	}
 
-	if len(config.HoldOffTunnelFrontingProviderIDs) > 0 {
-		applyParameters[parameters.HoldOffTunnelFrontingProviderIDs] = config.HoldOffTunnelFrontingProviderIDs
+	if len(config.HoldOffFrontingTunnelProviderIDs) > 0 {
+		applyParameters[parameters.HoldOffFrontingTunnelProviderIDs] = config.HoldOffFrontingTunnelProviderIDs
 	}
 
-	if config.HoldOffTunnelFrontingProbability != nil {
-		applyParameters[parameters.HoldOffTunnelFrontingProbability] = *config.HoldOffTunnelFrontingProbability
+	if config.HoldOffFrontingTunnelProbability != nil {
+		applyParameters[parameters.HoldOffFrontingTunnelProbability] = *config.HoldOffFrontingTunnelProbability
 	}
 
 	if config.HoldOffDirectTunnelMinDurationMilliseconds != nil {
@@ -3073,26 +3073,26 @@ func (config *Config) setDialParametersHash() {
 		binary.Write(hash, binary.LittleEndian, *config.HoldOffTunnelProbability)
 	}
 
-	if config.HoldOffTunnelFrontingMinDurationMilliseconds != nil {
-		hash.Write([]byte("HoldOffTunnelFrontingMinDurationMilliseconds"))
-		binary.Write(hash, binary.LittleEndian, int64(*config.HoldOffTunnelFrontingMinDurationMilliseconds))
+	if config.HoldOffFrontingTunnelMinDurationMilliseconds != nil {
+		hash.Write([]byte("HoldOffFrontingTunnelMinDurationMilliseconds"))
+		binary.Write(hash, binary.LittleEndian, int64(*config.HoldOffFrontingTunnelMinDurationMilliseconds))
 	}
 
-	if config.HoldOffTunnelFrontingMaxDurationMilliseconds != nil {
-		hash.Write([]byte("HoldOffTunnelFrontingMaxDurationMilliseconds"))
-		binary.Write(hash, binary.LittleEndian, int64(*config.HoldOffTunnelFrontingMaxDurationMilliseconds))
+	if config.HoldOffFrontingTunnelMaxDurationMilliseconds != nil {
+		hash.Write([]byte("HoldOffFrontingTunnelMaxDurationMilliseconds"))
+		binary.Write(hash, binary.LittleEndian, int64(*config.HoldOffFrontingTunnelMaxDurationMilliseconds))
 	}
 
-	if len(config.HoldOffTunnelFrontingProviderIDs) > 0 {
-		hash.Write([]byte("HoldOffTunnelFrontingProviderIDs"))
-		for _, providerID := range config.HoldOffTunnelFrontingProviderIDs {
+	if len(config.HoldOffFrontingTunnelProviderIDs) > 0 {
+		hash.Write([]byte("HoldOffFrontingTunnelProviderIDs"))
+		for _, providerID := range config.HoldOffFrontingTunnelProviderIDs {
 			hash.Write([]byte(providerID))
 		}
 	}
 
-	if config.HoldOffTunnelFrontingProbability != nil {
-		hash.Write([]byte("HoldOffTunnelFrontingProbability"))
-		binary.Write(hash, binary.LittleEndian, *config.HoldOffTunnelFrontingProbability)
+	if config.HoldOffFrontingTunnelProbability != nil {
+		hash.Write([]byte("HoldOffFrontingTunnelProbability"))
+		binary.Write(hash, binary.LittleEndian, *config.HoldOffFrontingTunnelProbability)
 	}
 
 	if config.HoldOffDirectTunnelProbability != nil {

psiphon/dialParameters.go

@@ -1002,7 +1002,7 @@ func MakeDialParameters(
 	if !isReplay || !replayHoldOffTunnel {
 
 		var holdOffTunnelDuration time.Duration
-		var holdOffTunnelFrontingDuration time.Duration
+		var HoldOffFrontingTunnelDuration time.Duration
 		var holdOffDirectTunnelDuration time.Duration
 		var holdOffInproxyTunnelDuration time.Duration
 
@@ -1019,14 +1019,14 @@ func MakeDialParameters(
 
 		if protocol.TunnelProtocolUsesFrontedMeek(dialParams.TunnelProtocol) &&
 			common.Contains(
-				p.Strings(parameters.HoldOffTunnelFrontingProviderIDs),
+				p.Strings(parameters.HoldOffFrontingTunnelProviderIDs),
 				dialParams.FrontingProviderID) {
 
-			if p.WeightedCoinFlip(parameters.HoldOffTunnelFrontingProbability) {
+			if p.WeightedCoinFlip(parameters.HoldOffFrontingTunnelProbability) {
 
-				holdOffTunnelFrontingDuration = prng.Period(
-					p.Duration(parameters.HoldOffTunnelFrontingMinDuration),
-					p.Duration(parameters.HoldOffTunnelFrontingMaxDuration))
+				HoldOffFrontingTunnelDuration = prng.Period(
+					p.Duration(parameters.HoldOffFrontingTunnelMinDuration),
+					p.Duration(parameters.HoldOffFrontingTunnelMaxDuration))
 			}
 		}
 
@@ -1057,7 +1057,7 @@ func MakeDialParameters(
 		// Use the longest hold off duration
 		dialParams.HoldOffTunnelDuration = common.MaxDuration(
 			holdOffTunnelDuration,
-			holdOffTunnelFrontingDuration,
+			HoldOffFrontingTunnelDuration,
 			holdOffDirectTunnelDuration,
 			holdOffInproxyTunnelDuration)
 	}

psiphon/dialParameters_test.go

@@ -103,10 +103,10 @@ func runDialParametersAndReplay(t *testing.T, tunnelProtocol string) {
 	applyParameters[parameters.HoldOffTunnelMaxDuration] = "10ms"
 	applyParameters[parameters.HoldOffTunnelProtocols] = holdOffTunnelProtocols
 	applyParameters[parameters.HoldOffTunnelProbability] = 1.0
-	applyParameters[parameters.HoldOffTunnelFrontingMinDuration] = "1ms"
-	applyParameters[parameters.HoldOffTunnelFrontingMaxDuration] = "10ms"
-	applyParameters[parameters.HoldOffTunnelFrontingProviderIDs] = []string{frontingProviderID}
-	applyParameters[parameters.HoldOffTunnelFrontingProbability] = 1.0
+	applyParameters[parameters.HoldOffFrontingTunnelMinDuration] = "1ms"
+	applyParameters[parameters.HoldOffFrontingTunnelMaxDuration] = "10ms"
+	applyParameters[parameters.HoldOffFrontingTunnelProviderIDs] = []string{frontingProviderID}
+	applyParameters[parameters.HoldOffFrontingTunnelProbability] = 1.0
 	applyParameters[parameters.HoldOffDirectTunnelMinDuration] = "1ms"
 	applyParameters[parameters.HoldOffDirectTunnelMaxDuration] = "10ms"
 	applyParameters[parameters.HoldOffDirectTunnelProviderRegions] = holdOffDirectTunnelProviderRegions
@@ -259,7 +259,7 @@ func runDialParametersAndReplay(t *testing.T, tunnelProtocol string) {
 	}
 
 	expectHoldOffTunnelProtocols := common.Contains(holdOffTunnelProtocols, tunnelProtocol)
-	expectHoldOffTunnelFrontingProviderIDs := protocol.TunnelProtocolUsesFrontedMeek(tunnelProtocol)
+	expectHoldOffFrontingTunnelProviderIDs := protocol.TunnelProtocolUsesFrontedMeek(tunnelProtocol)
 	expectHoldOffDirectTunnelProviderRegion := protocol.TunnelProtocolIsDirect(tunnelProtocol) &&
 		common.ContainsAny(
 			holdOffDirectTunnelProviderRegions[dialParams.ServerEntry.ProviderID],
@@ -270,7 +270,7 @@ func runDialParametersAndReplay(t *testing.T, tunnelProtocol string) {
 			[]string{"", dialParams.ServerEntry.Region})
 
 	if expectHoldOffTunnelProtocols ||
-		expectHoldOffTunnelFrontingProviderIDs ||
+		expectHoldOffFrontingTunnelProviderIDs ||
 		expectHoldOffDirectTunnelProviderRegion ||
 		expectHoldOffInproxyTunnelProviderRegion {
 		if dialParams.HoldOffTunnelDuration < 1*time.Millisecond ||