Check ADR bit in LinkADRAns

CHANGELOG.md

@@ -21,6 +21,7 @@ For details about compatibility between different releases, see the **Commitment
 
 - Enforce default page limit on AS and NS List RPCs if a value is not provided in the request.
 - Swapped field order in `RelayNotifyNewEndDeviceReq` MAC command.
+- `LinkADRAns` MAC command verification when the end device does not support ADR.
 
 ### Security
 

pkg/networkserver/grpc_gsns.go

@@ -568,7 +568,15 @@ macLoop:
 				break
 			}
 			cmds = cmds[dupCount:]
-			evs, err = mac.HandleLinkADRAns(ctx, dev, pld, uint(dupCount), cmacFMatchResult.FullFCnt, fps)
+			evs, err = mac.HandleLinkADRAns(
+				ctx,
+				dev,
+				pld,
+				uint(dupCount), // nolint: gosec
+				cmacFMatchResult.FullFCnt,
+				fps,
+				up.GetPayload().GetMacPayload().GetFHdr().GetFCtrl().GetAdr(),
+			)
 		case ttnpb.MACCommandIdentifier_CID_DUTY_CYCLE:
 			evs, err = mac.HandleDutyCycleAns(ctx, dev)
 		case ttnpb.MACCommandIdentifier_CID_RX_PARAM_SETUP:

pkg/networkserver/mac/link_adr.go

@@ -310,6 +310,7 @@ func HandleLinkADRAns(
 	dupCount uint,
 	fCntUp uint32,
 	fps *frequencyplans.Store,
+	adrEnabled bool,
 ) (events.Builders, error) {
 	if pld == nil {
 		return nil, ErrNoPayload.New()
@@ -321,7 +322,23 @@ func HandleLinkADRAns(
 	}
 
 	ev := EvtReceiveLinkADRAccept
-	if !pld.ChannelMaskAck || !pld.DataRateIndexAck || !pld.TxPowerIndexAck {
+	rejected := false
+
+	// LoRaWAN 1.0.4 spec L534-538:
+	// An end-device SHOULD accept the channel mask controls present in LinkADRReq, even
+	// when the ADR bit is not set. The end-device SHALL respond to all LinkADRReq commands
+	// with a LinkADRAns indicating which command elements were accepted and which were
+	// rejected. This behavior differs from when the uplink ADR bit is set, in which case the end-
+	// device accepts or rejects the entire command.
+	if macspec.UseADRBit(macState.LorawanVersion) {
+		rejected = (!adrEnabled && !pld.ChannelMaskAck) ||
+			(adrEnabled && !pld.DataRateIndexAck) ||
+			(adrEnabled && !pld.TxPowerIndexAck)
+	} else {
+		rejected = !pld.ChannelMaskAck || !pld.DataRateIndexAck || !pld.TxPowerIndexAck
+	}
+
+	if rejected {
 		ev = EvtReceiveLinkADRReject
 
 		// See "Table 6: LinkADRAns status bits signification" of LoRaWAN 1.1 specification

pkg/networkserver/mac/link_adr_test.go

@@ -434,6 +434,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 		DupCount         uint
 		Events           events.Builders
 		Error            error
+		AdrEnabled       bool
 	}{
 		{
 			Name: "nil payload",
@@ -451,7 +452,8 @@ func TestHandleLinkADRAns(t *testing.T) {
 					LorawanVersion: ttnpb.MACVersion_MAC_V1_1,
 				},
 			},
-			Error: ErrNoPayload,
+			Error:      ErrNoPayload,
+			AdrEnabled: true,
 		},
 		{
 			Name: "no request",
@@ -481,7 +483,101 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
-			Error: ErrRequestNotFound.WithAttributes("cid", ttnpb.MACCommandIdentifier_CID_LINK_ADR),
+			Error:      ErrRequestNotFound.WithAttributes("cid", ttnpb.MACCommandIdentifier_CID_LINK_ADR),
+			AdrEnabled: true,
+		},
+		{
+			Name: "1.0.2/channel mask on/adr enabled/rejected",
+			Device: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP001_V1_0_2_REV_B,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_2,
+				},
+			},
+			Expected: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP001_V1_0_2_REV_B,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_2,
+				},
+			},
+			Payload: &ttnpb.MACCommand_LinkADRAns{
+				ChannelMaskAck:   true,
+				DataRateIndexAck: false,
+				TxPowerIndexAck:  false,
+			},
+			Events: events.Builders{
+				EvtReceiveLinkADRReject.With(events.WithData(&ttnpb.MACCommand_LinkADRAns{
+					ChannelMaskAck:   true,
+					DataRateIndexAck: false,
+					TxPowerIndexAck:  false,
+				})),
+			},
+			Error:      ErrRequestNotFound.WithAttributes("cid", ttnpb.MACCommandIdentifier_CID_LINK_ADR),
+			AdrEnabled: true,
+		},
+		{
+			Name: "1.0.4/channel mask on/adr disabled/accepted",
+			Device: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP002_V1_0_4,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_4,
+				},
+			},
+			Expected: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP002_V1_0_4,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_4,
+				},
+			},
+			Payload: &ttnpb.MACCommand_LinkADRAns{
+				ChannelMaskAck:   true,
+				DataRateIndexAck: false,
+				TxPowerIndexAck:  false,
+			},
+			Events: events.Builders{
+				EvtReceiveLinkADRAccept.With(events.WithData(&ttnpb.MACCommand_LinkADRAns{
+					ChannelMaskAck:   true,
+					DataRateIndexAck: false,
+					TxPowerIndexAck:  false,
+				})),
+			},
+			Error:      ErrRequestNotFound.WithAttributes("cid", ttnpb.MACCommandIdentifier_CID_LINK_ADR),
+			AdrEnabled: false,
+		},
+		{
+			Name: "1.0.4/channel mask on/adr enabled/rejected",
+			Device: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP002_V1_0_4,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_4,
+				},
+			},
+			Expected: &ttnpb.EndDevice{
+				FrequencyPlanId:   test.EUFrequencyPlanID,
+				LorawanPhyVersion: ttnpb.PHYVersion_RP002_V1_0_4,
+				MacState: &ttnpb.MACState{
+					LorawanVersion: ttnpb.MACVersion_MAC_V1_0_4,
+				},
+			},
+			Payload: &ttnpb.MACCommand_LinkADRAns{
+				ChannelMaskAck:   true,
+				DataRateIndexAck: false,
+				TxPowerIndexAck:  false,
+			},
+			Events: events.Builders{
+				EvtReceiveLinkADRReject.With(events.WithData(&ttnpb.MACCommand_LinkADRAns{
+					ChannelMaskAck:   true,
+					DataRateIndexAck: false,
+					TxPowerIndexAck:  false,
+				})),
+			},
+			Error:      ErrRequestNotFound.WithAttributes("cid", ttnpb.MACCommandIdentifier_CID_LINK_ADR),
+			AdrEnabled: true,
 		},
 		{
 			Name: "1 request/all ack",
@@ -547,6 +643,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
+			AdrEnabled: true,
 		},
 		{
 			Name: "1.1/2 requests/all ack",
@@ -636,6 +733,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
+			AdrEnabled: true,
 		},
 		{
 			Name:     "1.0.2/2 requests/all ack",
@@ -726,6 +824,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
+			AdrEnabled: true,
 		},
 		{
 			Name: "1.0/2 requests/all ack",
@@ -825,6 +924,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
+			AdrEnabled: true,
 		},
 		{
 			Name: "1.0.2/2 requests/US915 FSB2",
@@ -888,6 +988,7 @@ func TestHandleLinkADRAns(t *testing.T) {
 					TxPowerIndexAck:  true,
 				})),
 			},
+			AdrEnabled: true,
 		},
 	} {
 		tc := tc
@@ -897,7 +998,8 @@ func TestHandleLinkADRAns(t *testing.T) {
 			Func: func(ctx context.Context, t *testing.T, a *assertions.Assertion) {
 				dev := ttnpb.Clone(tc.Device)
 
-				evs, err := HandleLinkADRAns(ctx, dev, tc.Payload, tc.DupCount, fCntUp, frequencyplans.NewStore(test.FrequencyPlansFetcher))
+				fps := frequencyplans.NewStore(test.FrequencyPlansFetcher)
+				evs, err := HandleLinkADRAns(ctx, dev, tc.Payload, tc.DupCount, fCntUp, fps, tc.AdrEnabled)
 				if tc.Error != nil && !a.So(err, should.EqualErrorOrDefinition, tc.Error) ||
 					tc.Error == nil && !a.So(err, should.BeNil) {
 					t.FailNow()

pkg/specification/macspec/specification.go

@@ -237,3 +237,9 @@ func EncryptionOptions(v ttnpb.MACVersion, frameType FrameType, fPort uint32, cm
 func ValidateUplinkPayloadSize(v ttnpb.MACVersion) bool {
 	return compareMACVersion(v, ttnpb.MACVersion_MAC_V1_1) >= 0
 }
+
+// UseADRBit reports whether v uses the ADR bit in the FCtrl field.
+func UseADRBit(v ttnpb.MACVersion) bool {
+	return compareMACVersion(v, ttnpb.MACVersion_MAC_V1_0_3) >= 0 &&
+		compareMACVersion(v, ttnpb.MACVersion_MAC_V1_0_4) <= 0
+}