Merge pull request #6754 from TheThingsNetwork/feature/band-relay-bac…

…koff Add band served relay backoff
TheThingsNetwork · Dec 11, 2023 · e8cc745 · e8cc745
2 parents 7133999 + 7a378d7
commit e8cc745
Show file tree

Hide file tree

Showing 156 changed files with 314 additions and 155 deletions.
diff --git a/pkg/band/shared.go b/pkg/band/shared.go
@@ -50,6 +50,9 @@ type SharedParameters struct {
 	RelayForwardDelay time.Duration
 	// RelayReceiveDelay is the default RxR window timing in seconds.
 	RelayReceiveDelay time.Duration
+	// ServedRelayBackoff is the default number of wake on radio attempts before sending the uplink message directly
+	// by a served relay device.
+	ServedRelayBackoff uint32
 }
 
 var (
@@ -68,6 +71,7 @@ var (
 		parameters := universalSharedParameters
 		parameters.RelayForwardDelay = 50 * time.Millisecond
 		parameters.RelayReceiveDelay = 18 * time.Second
+		parameters.ServedRelayBackoff = 8
 		return parameters
 	}()
 )
diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_1.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_2.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_3.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_3.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_2_RP002_V1_0_4.json b/pkg/band/testdata/AS_923_2_RP002_V1_0_4.json
@@ -710,6 +710,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_1.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_2.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_3.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_3.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_3_RP002_V1_0_4.json b/pkg/band/testdata/AS_923_3_RP002_V1_0_4.json
@@ -710,6 +710,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/AS_923_4_RP002_V1_0_3.json b/pkg/band/testdata/AS_923_4_RP002_V1_0_3.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_4_RP002_V1_0_4.json b/pkg/band/testdata/AS_923_4_RP002_V1_0_4.json
@@ -710,6 +710,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_A.json
@@ -702,6 +702,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/AS_923_PHY_V1_0_2_REV_B.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_0_3_REV_A.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json b/pkg/band/testdata/AS_923_PHY_V1_1_REV_A.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json b/pkg/band/testdata/AS_923_PHY_V1_1_REV_B.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_0.json b/pkg/band/testdata/AS_923_RP002_V1_0_0.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_1.json b/pkg/band/testdata/AS_923_RP002_V1_0_1.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_2.json b/pkg/band/testdata/AS_923_RP002_V1_0_2.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_3.json b/pkg/band/testdata/AS_923_RP002_V1_0_3.json
@@ -704,6 +704,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AS_923_RP002_V1_0_4.json b/pkg/band/testdata/AS_923_RP002_V1_0_4.json
@@ -710,6 +710,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_1.json
@@ -926,6 +926,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_A.json
@@ -926,6 +926,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_2_REV_B.json
@@ -996,6 +996,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_0_3_REV_A.json
@@ -1001,6 +1001,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_A.json
@@ -996,6 +996,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json b/pkg/band/testdata/AU_915_928_PHY_V1_1_REV_B.json
@@ -1000,6 +1000,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_0.json
@@ -1000,6 +1000,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_1.json
@@ -1000,6 +1000,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_2.json
@@ -1024,6 +1024,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_3.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_3.json
@@ -1024,6 +1024,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/AU_915_928_RP002_V1_0_4.json b/pkg/band/testdata/AU_915_928_RP002_V1_0_4.json
@@ -1035,6 +1035,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_0.json
@@ -1112,6 +1112,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_1.json
@@ -1123,6 +1123,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_2.json
@@ -1123,6 +1123,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_3.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_3.json
@@ -1123,6 +1123,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_4.json b/pkg/band/testdata/CN_470_510_20_A_RP002_V1_0_4.json
@@ -1134,6 +1134,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 50000000,
-    "RelayReceiveDelay": 18000000000
+    "RelayReceiveDelay": 18000000000,
+    "ServedRelayBackoff": 8
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_0.json
@@ -1112,6 +1112,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }
diff --git a/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json b/pkg/band/testdata/CN_470_510_20_B_RP002_V1_0_1.json
@@ -1123,6 +1123,7 @@
     "MinRetransmitTimeout": 1000000000,
     "MaxRetransmitTimeout": 3000000000,
     "RelayForwardDelay": 0,
-    "RelayReceiveDelay": 0
+    "RelayReceiveDelay": 0,
+    "ServedRelayBackoff": 0
   }
 }