Add NS flag to force ADR optimizations

TheThingsArchive · Mar 6, 2019 · f57e965 · f57e965
1 parent 60d50d8
commit f57e965
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/cmd/docs/README.md b/cmd/docs/README.md
@@ -147,6 +147,7 @@ ttn gen-keypair generates a public/private keypair
 **Options**
 
 ```
+      --force-adr-optimize               Force ADR optimization
       --net-id int                       LoRaWAN NetID (default 19)
       --redis-address string             Redis server and port (default "localhost:6379")
       --redis-db int                     Redis database

diff --git a/cmd/networkserver.go b/cmd/networkserver.go
@@ -116,6 +116,9 @@ func init() {
 		"26000000/20": "otaa,abp,world,local,private,testing",
 	})
 
+	networkserverCmd.Flags().Bool("force-adr-optimize", false, "Force ADR optimization")
+	viper.BindPFlag("networkserver.force-adr-optimize", networkserverCmd.Flags().Lookup("force-adr-optimize"))
+
 	networkserverCmd.Flags().String("server-address", "0.0.0.0", "The IP address to listen for communication")
 	networkserverCmd.Flags().String("server-address-announce", "localhost", "The public IP address to announce")
 	networkserverCmd.Flags().Int("server-port", 1903, "The port for communication")

diff --git a/core/networkserver/adr.go b/core/networkserver/adr.go
@@ -14,6 +14,7 @@ import (
 	"github.com/TheThingsNetwork/ttn/core/networkserver/device"
 	"github.com/TheThingsNetwork/ttn/utils/errors"
 	"github.com/brocaar/lorawan"
+	"github.com/spf13/viper"
 )
 
 // DefaultADRMargin is the default SNR margin for ADR
@@ -120,6 +121,8 @@ func (n *networkServer) handleUplinkADR(message *pb_broker.DeduplicatedUplinkMes
 		dev.ADR.SendReq = true
 		if drIdx, err := fp.GetDataRateIndexFor(dev.ADR.DataRate); err == nil && drIdx == 0 {
 			forceADR = true
+		} else {
+			forceADR = viper.GetBool("networkserver.force-adr-optimize")
 		}
 		message.Trace = message.Trace.WithEvent(ScheduleMACEvent, macCMD, "link-adr", "reason", "optimize")
 		ctx.Debugf("Schedule ADR [optimize] %s->%s", dev.ADR.DataRate, desiredDataRate)