TheThingsNetwork · rvolosatovs · Jul 10, 2020 · Jul 9, 2020 · Jul 9, 2020
diff --git a/api/api.md b/api/api.md
@@ -4193,6 +4193,7 @@ Only the components for which the keys were meant, will have the key-encryption-
 | `f_port` | [`uint32`](#uint32) |  |  |
 | `frm_payload` | [`bytes`](#bytes) |  |  |
 | `decoded_payload` | [`google.protobuf.Struct`](#google.protobuf.Struct) |  |  |
+| `full_f_cnt` | [`uint32`](#uint32) |  | Full 32-bit FCnt value. Used internally by Network Server. |
 
 #### Field Rules
 

diff --git a/api/api.swagger.json b/api/api.swagger.json
@@ -11400,6 +11400,11 @@
         },
         "decoded_payload": {
           "type": "object"
+        },
+        "full_f_cnt": {
+          "type": "integer",
+          "format": "int64",
+          "description": "Full 32-bit FCnt value. Used internally by Network Server."
         }
       }
     },

diff --git a/api/lorawan.proto b/api/lorawan.proto
@@ -123,6 +123,8 @@ message MACPayload {
   uint32 f_port = 2 [(validate.rules).uint32.lte = 255];
   bytes frm_payload = 3 [(gogoproto.customname) = "FRMPayload"];
   google.protobuf.Struct decoded_payload = 4;
+  // Full 32-bit FCnt value. Used internally by Network Server.
+  uint32 full_f_cnt = 5;
 }
 
 message FHDR {

diff --git a/pkg/networkserver/adr.go b/pkg/networkserver/adr.go
@@ -95,8 +95,8 @@ func lossRate(nbTrans uint32, ups ...*ttnpb.UplinkMessage) float32 {
 		return 0
 	}
 
-	min := ups[0].Payload.GetMACPayload().FHDR.FCnt
-	max := lastUplink(ups...).Payload.GetMACPayload().FHDR.FCnt
+	min := ups[0].Payload.GetMACPayload().FullFCnt
+	max := lastUplink(ups...).Payload.GetMACPayload().FullFCnt
 
 	fCnt := min + 1
 	var fCntTrans uint32
@@ -105,7 +105,7 @@ func lossRate(nbTrans uint32, ups ...*ttnpb.UplinkMessage) float32 {
 
 loop:
 	for i := 0; i < len(ups); i++ {
-		switch v := ups[i].Payload.GetMACPayload().FHDR.FCnt; v {
+		switch v := ups[i].Payload.GetMACPayload().FullFCnt; v {
 		case min:
 			continue
 

diff --git a/pkg/networkserver/adr_test.go b/pkg/networkserver/adr_test.go
@@ -57,8 +57,9 @@ func newADRUplink(fCnt uint32, maxSNR float32, gtwCount uint, confirmed bool, tx
 						FCtrl: ttnpb.FCtrl{
 							ADR: true,
 						},
-						FCnt: fCnt,
+						FCnt: fCnt & 0xffff,
 					},
+					FullFCnt: fCnt,
 				},
 			},
 		},

diff --git a/pkg/networkserver/grpc_gsns.go b/pkg/networkserver/grpc_gsns.go
@@ -879,7 +879,7 @@ func (ns *NetworkServer) handleDataUplink(ctx context.Context, up *ttnpb.UplinkM
 		return err
 	}
 	ctx = matched.Context
-	pld.FCnt = matched.FCnt
+	pld.FullFCnt = matched.FCnt
 	up.DeviceChannelIndex = uint32(matched.ChannelIndex)
 	up.Settings.DataRateIndex = matched.DataRateIndex
 	ctx = log.NewContextWithFields(ctx, log.Fields(
@@ -950,7 +950,7 @@ func (ns *NetworkServer) handleDataUplink(ctx context.Context, up *ttnpb.UplinkM
 				matched = rematched
 
 				ctx = matched.Context
-				pld.FCnt = matched.FCnt
+				pld.FullFCnt = matched.FCnt
 				up.DeviceChannelIndex = uint32(matched.ChannelIndex)
 				up.Settings.DataRateIndex = matched.DataRateIndex
 				logger = log.FromContext(ctx).WithFields(log.Fields(

diff --git a/pkg/networkserver/networkserver_util_test.go b/pkg/networkserver/networkserver_util_test.go
@@ -663,6 +663,7 @@ func MakeDataUplink(macVersion ttnpb.MACVersion, decodePayload, confirmed bool,
 					FHDR:       fhdr,
 					FPort:      uint32(fPort),
 					FRMPayload: frmPayload,
+					FullFCnt:   fCnt,
 				},
 			},
 		}

diff --git a/pkg/ttnpb/end_device.pb.paths.fm.go b/pkg/ttnpb/end_device.pb.paths.fm.go
diff --git a/pkg/ttnpb/gatewayserver.pb.paths.fm.go b/pkg/ttnpb/gatewayserver.pb.paths.fm.go
diff --git a/pkg/ttnpb/join.pb.paths.fm.go b/pkg/ttnpb/join.pb.paths.fm.go
diff --git a/pkg/ttnpb/lorawan.pb.go b/pkg/ttnpb/lorawan.pb.go
diff --git a/pkg/ttnpb/lorawan.pb.paths.fm.go b/pkg/ttnpb/lorawan.pb.paths.fm.go
diff --git a/pkg/ttnpb/lorawan.pb.setters.fm.go b/pkg/ttnpb/lorawan.pb.setters.fm.go
diff --git a/pkg/ttnpb/lorawan.pb.validate.go b/pkg/ttnpb/lorawan.pb.validate.go
diff --git a/pkg/ttnpb/messages.pb.paths.fm.go b/pkg/ttnpb/messages.pb.paths.fm.go
diff --git a/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go b/pkg/ttnpb/qrcodegenerator.pb.paths.fm.go
diff --git a/sdk/js/generated/api.json b/sdk/js/generated/api.json
@@ -18224,6 +18224,16 @@
               "fullType": "google.protobuf.Struct",
               "ismap": false,
               "defaultValue": ""
+            },
+            {
+              "name": "full_f_cnt",
+              "description": "Full 32-bit FCnt value. Used internally by Network Server.",
+              "label": "",
+              "type": "uint32",
+              "longType": "uint32",
+              "fullType": "uint32",
+              "ismap": false,
+              "defaultValue": ""
             }
           ]
         },