From fd62076e023b87f4588b3fc8045a4402f03e68e9 Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Tue, 9 Aug 2022 15:28:37 +0100 Subject: [PATCH] Add plaintext_mac_commands field to up/down frame-log. --- api/go/api/frame_log.pb.go | 77 ++++++++++++------- api/grpc-web/api/frame_log_pb.d.ts | 8 ++ api/grpc-web/api/frame_log_pb.js | 64 ++++++++++++++- api/js/api/frame_log_pb.d.ts | 8 ++ api/js/api/frame_log_pb.js | 62 ++++++++++++++- api/md/api/api.md | 2 + api/proto/api/frame_log.proto | 6 ++ .../proto/chirpstack-api/api/frame_log.proto | 6 ++ .../src/chirpstack_api/api/frame_log_pb2.py | 8 +- api/rust/Cargo.lock | 2 +- api/rust/proto/chirpstack/api/frame_log.proto | 6 ++ 11 files changed, 214 insertions(+), 35 deletions(-) diff --git a/api/go/api/frame_log.pb.go b/api/go/api/frame_log.pb.go index 7b5bfe53..2f315ec7 100644 --- a/api/go/api/frame_log.pb.go +++ b/api/go/api/frame_log.pb.go @@ -42,6 +42,8 @@ type UplinkFrameLog struct { DevEui string `protobuf:"bytes,6,opt,name=dev_eui,json=devEui,proto3" json:"dev_eui,omitempty"` // Time. Time *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=time,proto3" json:"time,omitempty"` + // Plaintext mac-commands. + PlaintextMacCommands bool `protobuf:"varint,8,opt,name=plaintext_mac_commands,json=plaintextMacCommands,proto3" json:"plaintext_mac_commands,omitempty"` } func (x *UplinkFrameLog) Reset() { @@ -125,6 +127,13 @@ func (x *UplinkFrameLog) GetTime() *timestamppb.Timestamp { return nil } +func (x *UplinkFrameLog) GetPlaintextMacCommands() bool { + if x != nil { + return x.PlaintextMacCommands + } + return false +} + type DownlinkFrameLog struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -146,6 +155,8 @@ type DownlinkFrameLog struct { DevAddr string `protobuf:"bytes,7,opt,name=dev_addr,json=devAddr,proto3" json:"dev_addr,omitempty"` // Device EUI (optional). DevEui string `protobuf:"bytes,8,opt,name=dev_eui,json=devEui,proto3" json:"dev_eui,omitempty"` + // Plaintext mac-commands. + PlaintextMacCommands bool `protobuf:"varint,9,opt,name=plaintext_mac_commands,json=plaintextMacCommands,proto3" json:"plaintext_mac_commands,omitempty"` } func (x *DownlinkFrameLog) Reset() { @@ -236,6 +247,13 @@ func (x *DownlinkFrameLog) GetDevEui() string { return "" } +func (x *DownlinkFrameLog) GetPlaintextMacCommands() bool { + if x != nil { + return x.PlaintextMacCommands + } + return false +} + var File_api_frame_log_proto protoreflect.FileDescriptor var file_api_frame_log_proto_rawDesc = []byte{ @@ -244,7 +262,7 @@ var file_api_frame_log_proto_rawDesc = []byte{ 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0b, 0x67, 0x77, 0x2f, 0x67, 0x77, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x91, 0x02, + 0x1a, 0x0b, 0x67, 0x77, 0x2f, 0x67, 0x77, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc7, 0x02, 0x0a, 0x0e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x68, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, @@ -262,31 +280,38 @@ var file_api_frame_log_proto_rawDesc = []byte{ 0x69, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x46, 0x72, - 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, - 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x68, 0x79, 0x5f, 0x70, 0x61, - 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x68, 0x79, - 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, - 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f, - 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, - 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c, - 0x69, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, - 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x61, 0x74, 0x65, 0x77, - 0x61, 0x79, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x05, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x65, - 0x76, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, - 0x76, 0x41, 0x64, 0x64, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x5f, 0x65, 0x75, 0x69, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x45, 0x75, 0x69, 0x42, 0x54, - 0x0a, 0x11, 0x69, 0x6f, 0x2e, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, - 0x61, 0x70, 0x69, 0x42, 0x0d, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x63, 0x68, 0x69, 0x72, - 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x34, - 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, + 0x61, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x14, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4d, 0x61, 0x63, 0x43, + 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x22, 0xe0, 0x02, 0x0a, 0x10, 0x44, 0x6f, 0x77, 0x6e, + 0x6c, 0x69, 0x6e, 0x6b, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x12, 0x2e, 0x0a, 0x04, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, + 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, + 0x70, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0c, 0x52, 0x0a, 0x70, 0x68, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2b, 0x0a, + 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, + 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x6f, + 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x67, + 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x09, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x6d, 0x5f, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x6d, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x19, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x64, + 0x65, 0x76, 0x5f, 0x65, 0x75, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, + 0x76, 0x45, 0x75, 0x69, 0x12, 0x34, 0x0a, 0x16, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, + 0x74, 0x5f, 0x6d, 0x61, 0x63, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x70, 0x6c, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x4d, + 0x61, 0x63, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x42, 0x54, 0x0a, 0x11, 0x69, 0x6f, + 0x2e, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x61, 0x70, 0x69, 0x42, + 0x0d, 0x46, 0x72, 0x61, 0x6d, 0x65, 0x4c, 0x6f, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x2e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x68, 0x69, + 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, + 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x61, 0x70, 0x69, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/grpc-web/api/frame_log_pb.d.ts b/api/grpc-web/api/frame_log_pb.d.ts index b32aa0e3..b5f9fcdb 100644 --- a/api/grpc-web/api/frame_log_pb.d.ts +++ b/api/grpc-web/api/frame_log_pb.d.ts @@ -35,6 +35,9 @@ export class UplinkFrameLog extends jspb.Message { hasTime(): boolean; clearTime(): UplinkFrameLog; + getPlaintextMacCommands(): boolean; + setPlaintextMacCommands(value: boolean): UplinkFrameLog; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): UplinkFrameLog.AsObject; static toObject(includeInstance: boolean, msg: UplinkFrameLog): UplinkFrameLog.AsObject; @@ -52,6 +55,7 @@ export namespace UplinkFrameLog { devAddr: string, devEui: string, time?: google_protobuf_timestamp_pb.Timestamp.AsObject, + plaintextMacCommands: boolean, } } @@ -86,6 +90,9 @@ export class DownlinkFrameLog extends jspb.Message { getDevEui(): string; setDevEui(value: string): DownlinkFrameLog; + getPlaintextMacCommands(): boolean; + setPlaintextMacCommands(value: boolean): DownlinkFrameLog; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): DownlinkFrameLog.AsObject; static toObject(includeInstance: boolean, msg: DownlinkFrameLog): DownlinkFrameLog.AsObject; @@ -104,6 +111,7 @@ export namespace DownlinkFrameLog { mType: common_common_pb.MType, devAddr: string, devEui: string, + plaintextMacCommands: boolean, } } diff --git a/api/grpc-web/api/frame_log_pb.js b/api/grpc-web/api/frame_log_pb.js index 86a6886e..154cd53d 100644 --- a/api/grpc-web/api/frame_log_pb.js +++ b/api/grpc-web/api/frame_log_pb.js @@ -111,7 +111,8 @@ proto.api.UplinkFrameLog.toObject = function(includeInstance, msg) { mType: jspb.Message.getFieldWithDefault(msg, 4, 0), devAddr: jspb.Message.getFieldWithDefault(msg, 5, ""), devEui: jspb.Message.getFieldWithDefault(msg, 6, ""), - time: (f = msg.getTime()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f) + time: (f = msg.getTime()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f), + plaintextMacCommands: jspb.Message.getBooleanFieldWithDefault(msg, 8, false) }; if (includeInstance) { @@ -179,6 +180,10 @@ proto.api.UplinkFrameLog.deserializeBinaryFromReader = function(msg, reader) { reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader); msg.setTime(value); break; + case 8: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setPlaintextMacCommands(value); + break; default: reader.skipField(); break; @@ -260,6 +265,13 @@ proto.api.UplinkFrameLog.serializeBinaryToWriter = function(message, writer) { google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter ); } + f = message.getPlaintextMacCommands(); + if (f) { + writer.writeBool( + 8, + f + ); + } }; @@ -471,6 +483,24 @@ proto.api.UplinkFrameLog.prototype.hasTime = function() { }; +/** + * optional bool plaintext_mac_commands = 8; + * @return {boolean} + */ +proto.api.UplinkFrameLog.prototype.getPlaintextMacCommands = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 8, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.api.UplinkFrameLog} returns this + */ +proto.api.UplinkFrameLog.prototype.setPlaintextMacCommands = function(value) { + return jspb.Message.setProto3BooleanField(this, 8, value); +}; + + @@ -510,7 +540,8 @@ proto.api.DownlinkFrameLog.toObject = function(includeInstance, msg) { gatewayId: jspb.Message.getFieldWithDefault(msg, 5, ""), mType: jspb.Message.getFieldWithDefault(msg, 6, 0), devAddr: jspb.Message.getFieldWithDefault(msg, 7, ""), - devEui: jspb.Message.getFieldWithDefault(msg, 8, "") + devEui: jspb.Message.getFieldWithDefault(msg, 8, ""), + plaintextMacCommands: jspb.Message.getBooleanFieldWithDefault(msg, 9, false) }; if (includeInstance) { @@ -581,6 +612,10 @@ proto.api.DownlinkFrameLog.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {string} */ (reader.readString()); msg.setDevEui(value); break; + case 9: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setPlaintextMacCommands(value); + break; default: reader.skipField(); break; @@ -668,6 +703,13 @@ proto.api.DownlinkFrameLog.serializeBinaryToWriter = function(message, writer) { f ); } + f = message.getPlaintextMacCommands(); + if (f) { + writer.writeBool( + 9, + f + ); + } }; @@ -877,4 +919,22 @@ proto.api.DownlinkFrameLog.prototype.setDevEui = function(value) { }; +/** + * optional bool plaintext_mac_commands = 9; + * @return {boolean} + */ +proto.api.DownlinkFrameLog.prototype.getPlaintextMacCommands = function() { + return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 9, false)); +}; + + +/** + * @param {boolean} value + * @return {!proto.api.DownlinkFrameLog} returns this + */ +proto.api.DownlinkFrameLog.prototype.setPlaintextMacCommands = function(value) { + return jspb.Message.setProto3BooleanField(this, 9, value); +}; + + goog.object.extend(exports, proto.api); diff --git a/api/js/api/frame_log_pb.d.ts b/api/js/api/frame_log_pb.d.ts index af7100cd..759fe537 100644 --- a/api/js/api/frame_log_pb.d.ts +++ b/api/js/api/frame_log_pb.d.ts @@ -36,6 +36,9 @@ export class UplinkFrameLog extends jspb.Message { getTime(): google_protobuf_timestamp_pb.Timestamp | undefined; setTime(value?: google_protobuf_timestamp_pb.Timestamp): void; + getPlaintextMacCommands(): boolean; + setPlaintextMacCommands(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): UplinkFrameLog.AsObject; static toObject(includeInstance: boolean, msg: UplinkFrameLog): UplinkFrameLog.AsObject; @@ -55,6 +58,7 @@ export namespace UplinkFrameLog { devAddr: string, devEui: string, time?: google_protobuf_timestamp_pb.Timestamp.AsObject, + plaintextMacCommands: boolean, } } @@ -89,6 +93,9 @@ export class DownlinkFrameLog extends jspb.Message { getDevEui(): string; setDevEui(value: string): void; + getPlaintextMacCommands(): boolean; + setPlaintextMacCommands(value: boolean): void; + serializeBinary(): Uint8Array; toObject(includeInstance?: boolean): DownlinkFrameLog.AsObject; static toObject(includeInstance: boolean, msg: DownlinkFrameLog): DownlinkFrameLog.AsObject; @@ -109,6 +116,7 @@ export namespace DownlinkFrameLog { mType: common_common_pb.MTypeMap[keyof common_common_pb.MTypeMap], devAddr: string, devEui: string, + plaintextMacCommands: boolean, } } diff --git a/api/js/api/frame_log_pb.js b/api/js/api/frame_log_pb.js index 0a706f53..643a08ff 100644 --- a/api/js/api/frame_log_pb.js +++ b/api/js/api/frame_log_pb.js @@ -74,7 +74,8 @@ proto.api.UplinkFrameLog.toObject = function(includeInstance, msg) { mType: msg.getMType(), devAddr: msg.getDevAddr(), devEui: msg.getDevEui(), - time: (f = msg.getTime()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f) + time: (f = msg.getTime()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f), + plaintextMacCommands: msg.getPlaintextMacCommands() }; if (includeInstance) { @@ -143,6 +144,10 @@ proto.api.UplinkFrameLog.deserializeBinaryFromReader = function(msg, reader) { reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader); msg.setTime(value); break; + case 8: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setPlaintextMacCommands(value); + break; default: reader.skipField(); break; @@ -233,6 +238,13 @@ proto.api.UplinkFrameLog.prototype.serializeBinaryToWriter = function (writer) { google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter ); } + f = this.getPlaintextMacCommands(); + if (f) { + writer.writeBool( + 8, + f + ); + } }; @@ -412,6 +424,23 @@ proto.api.UplinkFrameLog.prototype.hasTime = function() { }; +/** + * optional bool plaintext_mac_commands = 8; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. + * @return {boolean} + */ +proto.api.UplinkFrameLog.prototype.getPlaintextMacCommands = function() { + return /** @type {boolean} */ (jspb.Message.getFieldProto3(this, 8, false)); +}; + + +/** @param {boolean} value */ +proto.api.UplinkFrameLog.prototype.setPlaintextMacCommands = function(value) { + jspb.Message.setField(this, 8, value); +}; + + /** * Generated by JsPbCodeGenerator. @@ -465,7 +494,8 @@ proto.api.DownlinkFrameLog.toObject = function(includeInstance, msg) { gatewayId: msg.getGatewayId(), mType: msg.getMType(), devAddr: msg.getDevAddr(), - devEui: msg.getDevEui() + devEui: msg.getDevEui(), + plaintextMacCommands: msg.getPlaintextMacCommands() }; if (includeInstance) { @@ -536,6 +566,10 @@ proto.api.DownlinkFrameLog.deserializeBinaryFromReader = function(msg, reader) { var value = /** @type {string} */ (reader.readString()); msg.setDevEui(value); break; + case 9: + var value = /** @type {boolean} */ (reader.readBool()); + msg.setPlaintextMacCommands(value); + break; default: reader.skipField(); break; @@ -632,6 +666,13 @@ proto.api.DownlinkFrameLog.prototype.serializeBinaryToWriter = function (writer) f ); } + f = this.getPlaintextMacCommands(); + if (f) { + writer.writeBool( + 9, + f + ); + } }; @@ -818,4 +859,21 @@ proto.api.DownlinkFrameLog.prototype.setDevEui = function(value) { }; +/** + * optional bool plaintext_mac_commands = 9; + * Note that Boolean fields may be set to 0/1 when serialized from a Java server. + * You should avoid comparisons like {@code val === true/false} in those cases. + * @return {boolean} + */ +proto.api.DownlinkFrameLog.prototype.getPlaintextMacCommands = function() { + return /** @type {boolean} */ (jspb.Message.getFieldProto3(this, 9, false)); +}; + + +/** @param {boolean} value */ +proto.api.DownlinkFrameLog.prototype.setPlaintextMacCommands = function(value) { + jspb.Message.setField(this, 9, value); +}; + + goog.object.extend(exports, proto.api); diff --git a/api/md/api/api.md b/api/md/api/api.md index 8f2e186b..a554d228 100644 --- a/api/md/api/api.md +++ b/api/md/api/api.md @@ -2647,6 +2647,7 @@ DeviceProfileService is the service providing API methods for managing device-pr | m_type | [common.MType](#common-MType) | | Message type. | | dev_addr | [string](#string) | | Device address (optional). | | dev_eui | [string](#string) | | Device EUI (optional). | +| plaintext_mac_commands | [bool](#bool) | | Plaintext mac-commands. | @@ -2668,6 +2669,7 @@ DeviceProfileService is the service providing API methods for managing device-pr | dev_addr | [string](#string) | | Device address (optional). | | dev_eui | [string](#string) | | Device EUI (optional). | | time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | Time. | +| plaintext_mac_commands | [bool](#bool) | | Plaintext mac-commands. | diff --git a/api/proto/api/frame_log.proto b/api/proto/api/frame_log.proto index 36ab6444..0bf4b010 100644 --- a/api/proto/api/frame_log.proto +++ b/api/proto/api/frame_log.proto @@ -32,6 +32,9 @@ message UplinkFrameLog { // Time. google.protobuf.Timestamp time = 7; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 8; } message DownlinkFrameLog { @@ -58,4 +61,7 @@ message DownlinkFrameLog { // Device EUI (optional). string dev_eui = 8; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 9; } diff --git a/api/python/proto/chirpstack-api/api/frame_log.proto b/api/python/proto/chirpstack-api/api/frame_log.proto index 41d281ba..775780d3 100644 --- a/api/python/proto/chirpstack-api/api/frame_log.proto +++ b/api/python/proto/chirpstack-api/api/frame_log.proto @@ -32,6 +32,9 @@ message UplinkFrameLog { // Time. google.protobuf.Timestamp time = 7; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 8; } message DownlinkFrameLog { @@ -58,4 +61,7 @@ message DownlinkFrameLog { // Device EUI (optional). string dev_eui = 8; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 9; } diff --git a/api/python/src/chirpstack_api/api/frame_log_pb2.py b/api/python/src/chirpstack_api/api/frame_log_pb2.py index 5828a454..ccc44820 100644 --- a/api/python/src/chirpstack_api/api/frame_log_pb2.py +++ b/api/python/src/chirpstack_api/api/frame_log_pb2.py @@ -17,7 +17,7 @@ from chirpstack_api.common import common_pb2 as chirpstack__api_dot_common_dot_c from chirpstack_api.gw import gw_pb2 as chirpstack__api_dot_gw_dot_gw__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"chirpstack-api/api/frame_log.proto\x12\x03\x61pi\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\"chirpstack-api/common/common.proto\x1a\x1a\x63hirpstack-api/gw/gw.proto\"\xd7\x01\n\x0eUplinkFrameLog\x12\x13\n\x0bphy_payload\x18\x01 \x01(\x0c\x12!\n\x07tx_info\x18\x02 \x01(\x0b\x32\x10.gw.UplinkTxInfo\x12!\n\x07rx_info\x18\x03 \x03(\x0b\x32\x10.gw.UplinkRxInfo\x12\x1d\n\x06m_type\x18\x04 \x01(\x0e\x32\r.common.MType\x12\x10\n\x08\x64\x65v_addr\x18\x05 \x01(\t\x12\x0f\n\x07\x64\x65v_eui\x18\x06 \x01(\t\x12(\n\x04time\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\"\xe1\x01\n\x10\x44ownlinkFrameLog\x12(\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x13\n\x0bphy_payload\x18\x02 \x01(\x0c\x12#\n\x07tx_info\x18\x03 \x01(\x0b\x32\x12.gw.DownlinkTxInfo\x12\x13\n\x0b\x64ownlink_id\x18\x04 \x01(\r\x12\x12\n\ngateway_id\x18\x05 \x01(\t\x12\x1d\n\x06m_type\x18\x06 \x01(\x0e\x32\r.common.MType\x12\x10\n\x08\x64\x65v_addr\x18\x07 \x01(\t\x12\x0f\n\x07\x64\x65v_eui\x18\x08 \x01(\tBT\n\x11io.chirpstack.apiB\rFrameLogProtoP\x01Z.github.com/chirpstack/chirpstack/api/go/v4/apib\x06proto3') +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"chirpstack-api/api/frame_log.proto\x12\x03\x61pi\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\"chirpstack-api/common/common.proto\x1a\x1a\x63hirpstack-api/gw/gw.proto\"\xf7\x01\n\x0eUplinkFrameLog\x12\x13\n\x0bphy_payload\x18\x01 \x01(\x0c\x12!\n\x07tx_info\x18\x02 \x01(\x0b\x32\x10.gw.UplinkTxInfo\x12!\n\x07rx_info\x18\x03 \x03(\x0b\x32\x10.gw.UplinkRxInfo\x12\x1d\n\x06m_type\x18\x04 \x01(\x0e\x32\r.common.MType\x12\x10\n\x08\x64\x65v_addr\x18\x05 \x01(\t\x12\x0f\n\x07\x64\x65v_eui\x18\x06 \x01(\t\x12(\n\x04time\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x1e\n\x16plaintext_mac_commands\x18\x08 \x01(\x08\"\x81\x02\n\x10\x44ownlinkFrameLog\x12(\n\x04time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x13\n\x0bphy_payload\x18\x02 \x01(\x0c\x12#\n\x07tx_info\x18\x03 \x01(\x0b\x32\x12.gw.DownlinkTxInfo\x12\x13\n\x0b\x64ownlink_id\x18\x04 \x01(\r\x12\x12\n\ngateway_id\x18\x05 \x01(\t\x12\x1d\n\x06m_type\x18\x06 \x01(\x0e\x32\r.common.MType\x12\x10\n\x08\x64\x65v_addr\x18\x07 \x01(\t\x12\x0f\n\x07\x64\x65v_eui\x18\x08 \x01(\t\x12\x1e\n\x16plaintext_mac_commands\x18\t \x01(\x08\x42T\n\x11io.chirpstack.apiB\rFrameLogProtoP\x01Z.github.com/chirpstack/chirpstack/api/go/v4/apib\x06proto3') @@ -42,7 +42,7 @@ if _descriptor._USE_C_DESCRIPTORS == False: DESCRIPTOR._options = None DESCRIPTOR._serialized_options = b'\n\021io.chirpstack.apiB\rFrameLogProtoP\001Z.github.com/chirpstack/chirpstack/api/go/v4/api' _UPLINKFRAMELOG._serialized_start=141 - _UPLINKFRAMELOG._serialized_end=356 - _DOWNLINKFRAMELOG._serialized_start=359 - _DOWNLINKFRAMELOG._serialized_end=584 + _UPLINKFRAMELOG._serialized_end=388 + _DOWNLINKFRAMELOG._serialized_start=391 + _DOWNLINKFRAMELOG._serialized_end=648 # @@protoc_insertion_point(module_scope) diff --git a/api/rust/Cargo.lock b/api/rust/Cargo.lock index daf246e0..b5918ff3 100644 --- a/api/rust/Cargo.lock +++ b/api/rust/Cargo.lock @@ -121,7 +121,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chirpstack_api" -version = "4.0.0-test.17" +version = "4.0.0-test.18" dependencies = [ "hex", "pbjson", diff --git a/api/rust/proto/chirpstack/api/frame_log.proto b/api/rust/proto/chirpstack/api/frame_log.proto index 36ab6444..0bf4b010 100644 --- a/api/rust/proto/chirpstack/api/frame_log.proto +++ b/api/rust/proto/chirpstack/api/frame_log.proto @@ -32,6 +32,9 @@ message UplinkFrameLog { // Time. google.protobuf.Timestamp time = 7; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 8; } message DownlinkFrameLog { @@ -58,4 +61,7 @@ message DownlinkFrameLog { // Device EUI (optional). string dev_eui = 8; + + // Plaintext mac-commands. + bool plaintext_mac_commands = 9; }