Store encrypted_time in GatewayMetadata

TheThingsArchive · Jun 29, 2017 · 16d707f · 16d707f
1 parent 0b537f7
commit 16d707f
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 87 deletions.
diff --git a/api/gateway/gateway.pb.go b/api/gateway/gateway.pb.go
diff --git a/api/gateway/gateway.proto b/api/gateway/gateway.proto
@@ -90,8 +90,8 @@ message RxMetadata {
     // Frequency offset
     uint64 frequency_offset = 8;
 
-    // Encrypted time from the Gateway FPGA
-    bytes encrypted_time = 10;
+    // Encrypted time from the Gateway FPGA in base64
+    string encrypted_time = 10;
   }
 
   LocationMetadata location = 41;

diff --git a/core/handler/convert_metadata.go b/core/handler/convert_metadata.go
@@ -63,6 +63,7 @@ func (h *handler) ConvertMetadata(ctx ttnlog.Interface, ttnUp *pb_broker.Dedupli
 				gatewayMetadata.SNR = antenna.Snr
 				gatewayMetadata.FTime = antenna.Ftime
 				gatewayMetadata.FrequencyOffset = antenna.FrequencyOffset
+				gatewayMetadata.EncryptedTime = antenna.EncryptedTime
 				appUp.Metadata.Gateways = append(appUp.Metadata.Gateways, gatewayMetadata)
 			}
 		} else {

diff --git a/core/types/gateway_metadata.go b/core/types/gateway_metadata.go
@@ -17,6 +17,7 @@ type GatewayMetadata struct {
 	FTime           uint64   `json:"ftime,omitempty"`
 	FrequencyOffset uint64   `json:"frequency_offset,omitempty"`
 	SNR             float32  `json:"snr,omitempty"`
+	EncryptedTime   string   `json:"encrypted_time,omitempty"`
 	RFChain         uint32   `json:"rf_chain,omitempty"`
 	LocationMetadata
 }