mirror of
https://github.com/chirpstack/chirpstack.git
synced 2025-04-19 23:22:55 +00:00
Compare commits
3 Commits
v4.10.2
...
v4.11.0-te
| Author | SHA1 | Date | |
|---|---|---|---|
| 64b2e82244 | |||
| 70e4afae54 | |||
| 922a83597f |
12
Cargo.lock
generated
12
Cargo.lock
generated
@ -611,7 +611,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "backend"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"aes-kw",
|
||||
"anyhow",
|
||||
@ -813,7 +813,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||
|
||||
[[package]]
|
||||
name = "chirpstack"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"anyhow",
|
||||
@ -907,7 +907,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "chirpstack_api"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"hex",
|
||||
"pbjson",
|
||||
@ -924,7 +924,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "chirpstack_integration"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-trait",
|
||||
@ -2668,7 +2668,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lrwn"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"anyhow",
|
||||
@ -2682,7 +2682,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lrwn_filters"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
dependencies = [
|
||||
"hex",
|
||||
"lrwn",
|
||||
|
||||
340
api/go/integration/integration.pb.go
vendored
340
api/go/integration/integration.pb.go
vendored
@ -425,6 +425,9 @@ type UplinkEvent struct {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
JoinServerContext *common.JoinServerContext `protobuf:"bytes,15,opt,name=join_server_context,json=joinServerContext,proto3" json:"join_server_context,omitempty"`
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
RegionConfigId string `protobuf:"bytes,16,opt,name=region_config_id,json=regionConfigId,proto3" json:"region_config_id,omitempty"`
|
||||
}
|
||||
|
||||
func (x *UplinkEvent) Reset() {
|
||||
@ -562,6 +565,13 @@ func (x *UplinkEvent) GetJoinServerContext() *common.JoinServerContext {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkEvent) GetRegionConfigId() string {
|
||||
if x != nil {
|
||||
return x.RegionConfigId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// JoinEvent is the message sent when a device joined the network.
|
||||
// Note: this event is sent at the first uplink after OTAA.
|
||||
type JoinEvent struct {
|
||||
@ -584,6 +594,9 @@ type JoinEvent struct {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
JoinServerContext *common.JoinServerContext `protobuf:"bytes,6,opt,name=join_server_context,json=joinServerContext,proto3" json:"join_server_context,omitempty"`
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
RegionConfigId string `protobuf:"bytes,7,opt,name=region_config_id,json=regionConfigId,proto3" json:"region_config_id,omitempty"`
|
||||
}
|
||||
|
||||
func (x *JoinEvent) Reset() {
|
||||
@ -658,6 +671,13 @@ func (x *JoinEvent) GetJoinServerContext() *common.JoinServerContext {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *JoinEvent) GetRegionConfigId() string {
|
||||
if x != nil {
|
||||
return x.RegionConfigId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// AckEvent is the message sent when a confirmation on a confirmed downlink
|
||||
// has been received -or- when the downlink timed out.
|
||||
type AckEvent struct {
|
||||
@ -1365,7 +1385,7 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x6e, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x73, 0x73, 0x69,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x73, 0x73, 0x69, 0x12, 0x1f, 0x0a, 0x0b,
|
||||
0x77, 0x6f, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28,
|
||||
0x0d, 0x52, 0x0a, 0x77, 0x6f, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x22, 0xd3, 0x04,
|
||||
0x0d, 0x52, 0x0a, 0x77, 0x6f, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x22, 0xfd, 0x04,
|
||||
0x0a, 0x0b, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a,
|
||||
0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69,
|
||||
@ -1403,7 +1423,33 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4a,
|
||||
0x6f, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
|
||||
0x52, 0x11, 0x6a, 0x6f, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74,
|
||||
0x65, 0x78, 0x74, 0x22, 0xca, 0x02, 0x0a, 0x09, 0x4a, 0x6f, 0x69, 0x6e, 0x45, 0x76, 0x65, 0x6e,
|
||||
0x65, 0x78, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f,
|
||||
0x6e, 0x66, 0x69, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72,
|
||||
0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x64, 0x22, 0xf4, 0x02,
|
||||
0x0a, 0x09, 0x4a, 0x6f, 0x69, 0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64,
|
||||
0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
|
||||
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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65,
|
||||
0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e,
|
||||
0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f,
|
||||
0x12, 0x19, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64, 0x72, 0x12, 0x42, 0x0a, 0x0d, 0x72,
|
||||
0x65, 0x6c, 0x61, 0x79, 0x5f, 0x72, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x6c, 0x61, 0x79, 0x52, 0x78, 0x49, 0x6e,
|
||||
0x66, 0x6f, 0x52, 0x0b, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x52, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
||||
0x49, 0x0a, 0x13, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x63,
|
||||
0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63,
|
||||
0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4a, 0x6f, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72,
|
||||
0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x11, 0x6a, 0x6f, 0x69, 0x6e, 0x53, 0x65, 0x72,
|
||||
0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x28, 0x0a, 0x10, 0x72, 0x65,
|
||||
0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x07,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x66,
|
||||
0x69, 0x67, 0x49, 0x64, 0x22, 0x85, 0x02, 0x0a, 0x08, 0x41, 0x63, 0x6b, 0x45, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64,
|
||||
0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04,
|
||||
@ -1413,97 +1459,55 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
|
||||
0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x19, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x5f, 0x61, 0x64,
|
||||
0x64, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x64, 0x65, 0x76, 0x41, 0x64, 0x64,
|
||||
0x72, 0x12, 0x42, 0x0a, 0x0d, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x72, 0x78, 0x5f, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x6c,
|
||||
0x61, 0x79, 0x52, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x52,
|
||||
0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x49, 0x0a, 0x13, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x73, 0x65,
|
||||
0x72, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4a, 0x6f, 0x69, 0x6e,
|
||||
0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x11, 0x6a,
|
||||
0x6f, 0x69, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
|
||||
0x22, 0x85, 0x02, 0x0a, 0x08, 0x41, 0x63, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a,
|
||||
0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69,
|
||||
0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x18, 0x02, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e,
|
||||
0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0d, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d,
|
||||
0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x71, 0x75, 0x65, 0x75, 0x65,
|
||||
0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x63, 0x6b, 0x6e, 0x6f, 0x77,
|
||||
0x6c, 0x65, 0x64, 0x67, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x63,
|
||||
0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x0a, 0x66, 0x5f,
|
||||
0x63, 0x6e, 0x74, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08,
|
||||
0x66, 0x43, 0x6e, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x22, 0xa5, 0x02, 0x0a, 0x0a, 0x54, 0x78, 0x41,
|
||||
0x63, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
|
||||
0x69, 0x6e, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x6f,
|
||||
0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65,
|
||||
0x18, 0x02, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e,
|
||||
0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0d, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f, 0x69, 0x74, 0x65, 0x6d,
|
||||
0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x71, 0x75, 0x65, 0x75, 0x65,
|
||||
0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x0a, 0x66, 0x5f, 0x63, 0x6e, 0x74, 0x5f,
|
||||
0x64, 0x6f, 0x77, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x66, 0x43, 0x6e, 0x74,
|
||||
0x44, 0x6f, 0x77, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f,
|
||||
0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61,
|
||||
0x79, 0x49, 0x64, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x07,
|
||||
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,
|
||||
0x22, 0xe7, 0x02, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 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, 0x38, 0x0a,
|
||||
0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76,
|
||||
0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x05, 0x6c,
|
||||
0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x0e, 0x32, 0x14, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x2e, 0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x20,
|
||||
0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x12, 0x3c, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x22, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
|
||||
0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x1a, 0x3a,
|
||||
0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcf, 0x02, 0x0a, 0x0b, 0x53,
|
||||
0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65,
|
||||
0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
|
||||
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74,
|
||||
0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49,
|
||||
0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x06, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72,
|
||||
0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
|
||||
0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
|
||||
0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x3a, 0x0a, 0x19, 0x62,
|
||||
0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x5f, 0x75, 0x6e, 0x61,
|
||||
0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17,
|
||||
0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x55, 0x6e, 0x61, 0x76,
|
||||
0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x62, 0x61, 0x74, 0x74, 0x65,
|
||||
0x72, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0c,
|
||||
0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0xd2, 0x01, 0x0a,
|
||||
0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29,
|
||||
0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0d, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f,
|
||||
0x69, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x71,
|
||||
0x75, 0x65, 0x75, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x61, 0x63,
|
||||
0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
|
||||
0x52, 0x0c, 0x61, 0x63, 0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x64, 0x12, 0x1c,
|
||||
0x0a, 0x0a, 0x66, 0x5f, 0x63, 0x6e, 0x74, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x06, 0x20, 0x01,
|
||||
0x28, 0x0d, 0x52, 0x08, 0x66, 0x43, 0x6e, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x22, 0xa5, 0x02, 0x0a,
|
||||
0x0a, 0x54, 0x78, 0x41, 0x63, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64,
|
||||
0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
|
||||
0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04,
|
||||
0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 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, 0x38, 0x0a, 0x0b,
|
||||
0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
|
||||
0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69,
|
||||
0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x22, 0x0a, 0x0d, 0x71, 0x75, 0x65, 0x75, 0x65, 0x5f,
|
||||
0x69, 0x74, 0x65, 0x6d, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x71,
|
||||
0x75, 0x65, 0x75, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x0a, 0x66, 0x5f,
|
||||
0x63, 0x6e, 0x74, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08,
|
||||
0x66, 0x43, 0x6e, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x61, 0x74, 0x65,
|
||||
0x77, 0x61, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x61,
|
||||
0x74, 0x65, 0x77, 0x61, 0x79, 0x49, 0x64, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x18, 0x07, 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, 0x22, 0xe7, 0x02, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e,
|
||||
0x74, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x05, 0x6c,
|
||||
0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x69, 0x6e, 0x74,
|
||||
0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65,
|
||||
0x6c, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65,
|
||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f,
|
||||
0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3c, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18,
|
||||
0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e,
|
||||
0x74, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65,
|
||||
0x78, 0x74, 0x1a, 0x3a, 0x0a, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcf,
|
||||
0x02, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29,
|
||||
0x0a, 0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c,
|
||||
0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d,
|
||||
@ -1513,70 +1517,92 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17,
|
||||
0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76,
|
||||
0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49,
|
||||
0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
|
||||
0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4c,
|
||||
0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x22, 0xa2, 0x02, 0x0a, 0x10, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f,
|
||||
0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c,
|
||||
0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
|
||||
0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x69,
|
||||
0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
|
||||
0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x76, 0x65, 0x6e,
|
||||
0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18,
|
||||
0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06,
|
||||
0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0xb4, 0x01, 0x0a, 0x0f, 0x44, 0x6f, 0x77, 0x6e, 0x6c,
|
||||
0x69, 0x6e, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x65,
|
||||
0x76, 0x5f, 0x65, 0x75, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76,
|
||||
0x45, 0x75, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65, 0x64,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x65,
|
||||
0x64, 0x12, 0x15, 0x0a, 0x06, 0x66, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
|
||||
0x0d, 0x52, 0x05, 0x66, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x06,
|
||||
0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
|
||||
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53,
|
||||
0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2a, 0x2c, 0x0a,
|
||||
0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x08, 0x0a, 0x04, 0x49, 0x4e, 0x46,
|
||||
0x4f, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x01,
|
||||
0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x2a, 0xf7, 0x01, 0x0a, 0x07,
|
||||
0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f,
|
||||
0x57, 0x4e, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x49, 0x4e, 0x4b,
|
||||
0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x01, 0x12,
|
||||
0x10, 0x0a, 0x0c, 0x55, 0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x43, 0x10,
|
||||
0x02, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x43, 0x4f,
|
||||
0x44, 0x45, 0x43, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x54, 0x41, 0x41, 0x10, 0x04, 0x12,
|
||||
0x16, 0x0a, 0x12, 0x55, 0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x46, 0x5f, 0x43, 0x4e, 0x54, 0x5f,
|
||||
0x52, 0x45, 0x53, 0x45, 0x54, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x50, 0x4c, 0x49, 0x4e,
|
||||
0x4b, 0x5f, 0x4d, 0x49, 0x43, 0x10, 0x06, 0x12, 0x1f, 0x0a, 0x1b, 0x55, 0x50, 0x4c, 0x49, 0x4e,
|
||||
0x4b, 0x5f, 0x46, 0x5f, 0x43, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x4d,
|
||||
0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x07, 0x12, 0x14, 0x0a, 0x10, 0x44, 0x4f, 0x57, 0x4e,
|
||||
0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59, 0x10, 0x08, 0x12, 0x18,
|
||||
0x0a, 0x14, 0x52, 0x45, 0x4c, 0x41, 0x59, 0x5f, 0x4e, 0x45, 0x57, 0x5f, 0x45, 0x4e, 0x44, 0x5f,
|
||||
0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x46, 0x5f, 0x43, 0x4e,
|
||||
0x54, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x45, 0x58, 0x50, 0x49,
|
||||
0x52, 0x45, 0x44, 0x10, 0x0b, 0x42, 0xbf, 0x01, 0x0a, 0x1d, 0x69, 0x6f, 0x2e, 0x63, 0x68, 0x69,
|
||||
0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x69, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x10, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x33, 0x67, 0x69, 0x74,
|
||||
0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x72, 0x6f, 0x63, 0x61, 0x61, 0x72, 0x2f,
|
||||
0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67,
|
||||
0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0xaa, 0x02, 0x16, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x49, 0x6e,
|
||||
0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xca, 0x02, 0x16, 0x43, 0x68, 0x69, 0x72,
|
||||
0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0xe2, 0x02, 0x22, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61,
|
||||
0x5c, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5c, 0x49, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x18, 0x05, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x06, 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x12, 0x32, 0x0a, 0x15, 0x65,
|
||||
0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x73, 0x6f,
|
||||
0x75, 0x72, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65,
|
||||
0x72, 0x6e, 0x61, 0x6c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12,
|
||||
0x3a, 0x0a, 0x19, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c,
|
||||
0x5f, 0x75, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01,
|
||||
0x28, 0x08, 0x52, 0x17, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c,
|
||||
0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x62,
|
||||
0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x08, 0x20, 0x01,
|
||||
0x28, 0x02, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x65, 0x72, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c,
|
||||
0x22, 0xd2, 0x01, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x76, 0x65,
|
||||
0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65,
|
||||
0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a,
|
||||
0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 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, 0x38, 0x0a,
|
||||
0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76,
|
||||
0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
|
||||
0x6f, 0x6e, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x6c, 0x6f, 0x63,
|
||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa2, 0x02, 0x0a, 0x10, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65,
|
||||
0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 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, 0x38, 0x0a, 0x0b, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f,
|
||||
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x69, 0x6e, 0x74,
|
||||
0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49,
|
||||
0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
||||
0x29, 0x0a, 0x10, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e,
|
||||
0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x69, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76,
|
||||
0x65, 0x6e, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
|
||||
0x65, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2f, 0x0a, 0x06, 0x6f, 0x62, 0x6a,
|
||||
0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
|
||||
0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
|
||||
0x63, 0x74, 0x52, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x22, 0xb4, 0x01, 0x0a, 0x0f, 0x44,
|
||||
0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x0e,
|
||||
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17,
|
||||
0x0a, 0x07, 0x64, 0x65, 0x76, 0x5f, 0x65, 0x75, 0x69, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x06, 0x64, 0x65, 0x76, 0x45, 0x75, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x66, 0x69,
|
||||
0x72, 0x6d, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x66,
|
||||
0x69, 0x72, 0x6d, 0x65, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x66, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18,
|
||||
0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x66, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
|
||||
0x12, 0x2f, 0x0a, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
|
||||
0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63,
|
||||
0x74, 0x2a, 0x2c, 0x0a, 0x08, 0x4c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x08, 0x0a,
|
||||
0x04, 0x49, 0x4e, 0x46, 0x4f, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49,
|
||||
0x4e, 0x47, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x02, 0x2a,
|
||||
0xf7, 0x01, 0x0a, 0x07, 0x4c, 0x6f, 0x67, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55,
|
||||
0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x44, 0x4f, 0x57, 0x4e,
|
||||
0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x50, 0x41, 0x59, 0x4c, 0x4f, 0x41, 0x44, 0x5f, 0x53, 0x49, 0x5a,
|
||||
0x45, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x55, 0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x43, 0x4f,
|
||||
0x44, 0x45, 0x43, 0x10, 0x02, 0x12, 0x12, 0x0a, 0x0e, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x49, 0x4e,
|
||||
0x4b, 0x5f, 0x43, 0x4f, 0x44, 0x45, 0x43, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x54, 0x41,
|
||||
0x41, 0x10, 0x04, 0x12, 0x16, 0x0a, 0x12, 0x55, 0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x46, 0x5f,
|
||||
0x43, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x53, 0x45, 0x54, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x55,
|
||||
0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x4d, 0x49, 0x43, 0x10, 0x06, 0x12, 0x1f, 0x0a, 0x1b, 0x55,
|
||||
0x50, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x46, 0x5f, 0x43, 0x4e, 0x54, 0x5f, 0x52, 0x45, 0x54, 0x52,
|
||||
0x41, 0x4e, 0x53, 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x07, 0x12, 0x14, 0x0a, 0x10,
|
||||
0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x49, 0x4e, 0x4b, 0x5f, 0x47, 0x41, 0x54, 0x45, 0x57, 0x41, 0x59,
|
||||
0x10, 0x08, 0x12, 0x18, 0x0a, 0x14, 0x52, 0x45, 0x4c, 0x41, 0x59, 0x5f, 0x4e, 0x45, 0x57, 0x5f,
|
||||
0x45, 0x4e, 0x44, 0x5f, 0x44, 0x45, 0x56, 0x49, 0x43, 0x45, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a,
|
||||
0x46, 0x5f, 0x43, 0x4e, 0x54, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07,
|
||||
0x45, 0x58, 0x50, 0x49, 0x52, 0x45, 0x44, 0x10, 0x0b, 0x42, 0xbf, 0x01, 0x0a, 0x1d, 0x69, 0x6f,
|
||||
0x2e, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x61, 0x70, 0x69, 0x2e,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x10, 0x49, 0x6e, 0x74,
|
||||
0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
|
||||
0x33, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x72, 0x6f, 0x63,
|
||||
0x61, 0x61, 0x72, 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x61,
|
||||
0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x74, 0x69, 0x6f, 0x6e, 0xaa, 0x02, 0x16, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63,
|
||||
0x6b, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xca, 0x02, 0x16,
|
||||
0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5c, 0x49, 0x6e, 0x74, 0x65, 0x67,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0xe2, 0x02, 0x22, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61,
|
||||
0x64, 0x61, 0x74, 0x61, 0x5c, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5c,
|
||||
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
2
api/grpc-web/package.json
vendored
2
api/grpc-web/package.json
vendored
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@chirpstack/chirpstack-api-grpc-web",
|
||||
"version": "4.10.2",
|
||||
"version": "4.11.0-test.1",
|
||||
"description": "Chirpstack gRPC-web API",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
|
||||
2
api/java/build.gradle.kts
vendored
2
api/java/build.gradle.kts
vendored
@ -8,7 +8,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "io.chirpstack"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
||||
2
api/js/package.json
vendored
2
api/js/package.json
vendored
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@chirpstack/chirpstack-api",
|
||||
"version": "4.10.2",
|
||||
"version": "4.11.0-test.1",
|
||||
"description": "Chirpstack JS and TS API",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
|
||||
2
api/kotlin/build.gradle.kts
vendored
2
api/kotlin/build.gradle.kts
vendored
@ -9,7 +9,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "io.chirpstack"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
||||
2
api/php/composer.json
vendored
2
api/php/composer.json
vendored
@ -3,7 +3,7 @@
|
||||
"description": "Chirpstack PHP API",
|
||||
"license": "MIT",
|
||||
"type": "library",
|
||||
"version": "4.10.2",
|
||||
"version": "4.11.0-test.1",
|
||||
"require": {
|
||||
"php": ">=7.0.0",
|
||||
"grpc/grpc": "^v1.57.0",
|
||||
|
||||
8
api/proto/integration/integration.proto
vendored
8
api/proto/integration/integration.proto
vendored
@ -169,6 +169,10 @@ message UplinkEvent {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
common.JoinServerContext join_server_context = 15;
|
||||
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
string region_config_id = 16;
|
||||
}
|
||||
|
||||
// JoinEvent is the message sent when a device joined the network.
|
||||
@ -194,6 +198,10 @@ message JoinEvent {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
common.JoinServerContext join_server_context = 6;
|
||||
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
string region_config_id = 7;
|
||||
}
|
||||
|
||||
// AckEvent is the message sent when a confirmation on a confirmed downlink
|
||||
|
||||
2
api/python/src/setup.py
vendored
2
api/python/src/setup.py
vendored
@ -18,7 +18,7 @@ CLASSIFIERS = [
|
||||
|
||||
setup(
|
||||
name='chirpstack-api',
|
||||
version = "4.10.2",
|
||||
version = "4.11.0-test.1",
|
||||
url='https://github.com/brocaar/chirpstack-api',
|
||||
author='Orne Brocaar',
|
||||
author_email='info@brocaar.com',
|
||||
|
||||
2
api/rust/Cargo.toml
vendored
2
api/rust/Cargo.toml
vendored
@ -1,7 +1,7 @@
|
||||
[package]
|
||||
name = "chirpstack_api"
|
||||
description = "ChirpStack Protobuf / gRPC API definitions."
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
license = "MIT"
|
||||
homepage = "https://www.chirpstack.io"
|
||||
|
||||
@ -169,6 +169,10 @@ message UplinkEvent {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
common.JoinServerContext join_server_context = 15;
|
||||
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
string region_config_id = 16;
|
||||
}
|
||||
|
||||
// JoinEvent is the message sent when a device joined the network.
|
||||
@ -194,6 +198,10 @@ message JoinEvent {
|
||||
// the AppSKey and that the encryption / decryption of the payloads is
|
||||
// the responsibility of the end-application.
|
||||
common.JoinServerContext join_server_context = 6;
|
||||
|
||||
// Region config ID.
|
||||
// This contains the region config ID which reported the uplink.
|
||||
string region_config_id = 7;
|
||||
}
|
||||
|
||||
// AckEvent is the message sent when a confirmation on a confirmed downlink
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "backend"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
edition = "2018"
|
||||
publish = false
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
description = "Library for building external ChirpStack integrations"
|
||||
homepage = "https://www.chirpstack.io/"
|
||||
license = "MIT"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
edition = "2021"
|
||||
repository = "https://github.com/chirpstack/chirpstack"
|
||||
|
||||
[dependencies]
|
||||
chirpstack_api = { path = "../api/rust", version = "4.10.2" }
|
||||
chirpstack_api = { path = "../api/rust", version = "4.11.0-test.1" }
|
||||
redis = { version = "0.27", features = [
|
||||
"cluster-async",
|
||||
"tokio-rustls-comp",
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
|
||||
repository = "https://github.com/chirpstack/chirpstack"
|
||||
homepage = "https://www.chirpstack.io/"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
edition = "2021"
|
||||
publish = false
|
||||
|
||||
@ -182,7 +182,7 @@ impl TxAck {
|
||||
|
||||
async fn get_downlink_frame(&mut self) -> Result<()> {
|
||||
trace!("Get downlink-frame from Redis");
|
||||
let df = downlink_frame::get(self.downlink_id).await?;
|
||||
let df = downlink_frame::get_and_del(self.downlink_id).await?;
|
||||
let gw_df = &df
|
||||
.downlink_frame
|
||||
.as_ref()
|
||||
|
||||
@ -5,7 +5,6 @@ use std::time::Duration;
|
||||
|
||||
use anyhow::Result;
|
||||
use async_trait::async_trait;
|
||||
use chrono::Utc;
|
||||
use handlebars::Handlebars;
|
||||
use prometheus_client::encoding::EncodeLabelSet;
|
||||
use prometheus_client::metrics::counter::Counter;
|
||||
@ -360,19 +359,11 @@ async fn message_callback(
|
||||
event.v4_migrate();
|
||||
}
|
||||
|
||||
if let Some(rx_info) = &mut event.rx_info {
|
||||
set_gateway_json(&rx_info.gateway_id, json);
|
||||
rx_info.ns_time = Some(Utc::now().into());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), region_config_id.to_string());
|
||||
rx_info.metadata.insert(
|
||||
"region_common_name".to_string(),
|
||||
region_common_name.to_string(),
|
||||
);
|
||||
}
|
||||
|
||||
tokio::spawn(uplink::deduplicate_uplink(event));
|
||||
tokio::spawn(uplink::deduplicate_uplink(
|
||||
region_common_name,
|
||||
region_config_id.to_string(),
|
||||
event,
|
||||
));
|
||||
} else if topic.ends_with("/stats") {
|
||||
EVENT_COUNTER
|
||||
.get_or_create(&EventLabels {
|
||||
|
||||
@ -299,6 +299,7 @@ pub async fn get(dev_eui: &EUI64) -> Result<Device, Error> {
|
||||
// On Ok response, the PhyPayload f_cnt will be set to the full 32bit frame-counter based on the
|
||||
// device-session context.
|
||||
pub async fn get_for_phypayload_and_incr_f_cnt_up(
|
||||
region_config_id: &str,
|
||||
relayed: bool,
|
||||
phy: &mut lrwn::PhyPayload,
|
||||
tx_dr: u8,
|
||||
@ -341,7 +342,17 @@ pub async fn get_for_phypayload_and_incr_f_cnt_up(
|
||||
}
|
||||
|
||||
for ds in &mut sessions {
|
||||
if ds.dev_addr != dev_addr.to_vec() {
|
||||
// Set the region_config_id if it is empty, e.g. after a ChirpStack v3 to
|
||||
// ChirpStack v4 migration.
|
||||
if ds.region_config_id.is_empty() {
|
||||
ds.region_config_id = region_config_id.into();
|
||||
}
|
||||
// Check that the DevAddr and region_config_id are equal.
|
||||
// The latter is needed because we must assure that the uplink was received
|
||||
// under the same region as the device was activated. In case the uplink was
|
||||
// received under two region configurations, this will start two uplink flows,
|
||||
// each with their own region_config_id associated.
|
||||
if ds.region_config_id != region_config_id || ds.dev_addr != dev_addr.to_vec() {
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -1162,6 +1173,7 @@ pub mod test {
|
||||
dev_addr: Some(DevAddr::from_be_bytes([1, 2, 3, 4])),
|
||||
device_session: Some(
|
||||
internal::DeviceSession {
|
||||
region_config_id: "eu868".into(),
|
||||
dev_addr: vec![0x01, 0x02, 0x03, 0x04],
|
||||
s_nwk_s_int_key: vec![
|
||||
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
|
||||
@ -1191,6 +1203,7 @@ pub mod test {
|
||||
dev_addr: Some(DevAddr::from_be_bytes([1, 2, 3, 4])),
|
||||
device_session: Some(
|
||||
internal::DeviceSession {
|
||||
region_config_id: "eu868".into(),
|
||||
dev_addr: vec![0x01, 0x02, 0x03, 0x04],
|
||||
s_nwk_s_int_key: vec![
|
||||
0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
|
||||
@ -1220,6 +1233,7 @@ pub mod test {
|
||||
secondary_dev_addr: Some(DevAddr::from_be_bytes([4, 3, 2, 1])),
|
||||
device_session: Some(
|
||||
internal::DeviceSession {
|
||||
region_config_id: "eu868".into(),
|
||||
dev_addr: vec![0x01, 0x02, 0x03, 0x04],
|
||||
s_nwk_s_int_key: vec![
|
||||
0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
|
||||
@ -1235,6 +1249,7 @@ pub mod test {
|
||||
],
|
||||
f_cnt_up: 300,
|
||||
pending_rejoin_device_session: Some(Box::new(internal::DeviceSession {
|
||||
region_config_id: "eu868".into(),
|
||||
dev_addr: vec![0x04, 0x03, 0x02, 0x01],
|
||||
s_nwk_s_int_key: vec![
|
||||
0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
|
||||
@ -1265,6 +1280,7 @@ pub mod test {
|
||||
dev_addr: Some(DevAddr::from_be_bytes([1, 2, 3, 4])),
|
||||
device_session: Some(
|
||||
internal::DeviceSession {
|
||||
region_config_id: "eu868".into(),
|
||||
dev_addr: vec![0x01, 0x02, 0x03, 0x04],
|
||||
s_nwk_s_int_key: vec![
|
||||
0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
|
||||
@ -1476,7 +1492,7 @@ pub mod test {
|
||||
pl.fhdr.f_cnt = tst.f_cnt % (1 << 16);
|
||||
}
|
||||
|
||||
let d = get_for_phypayload_and_incr_f_cnt_up(false, &mut phy, 0, 0).await;
|
||||
let d = get_for_phypayload_and_incr_f_cnt_up("eu868", false, &mut phy, 0, 0).await;
|
||||
if tst.expected_error.is_some() {
|
||||
assert!(d.is_err());
|
||||
assert_eq!(
|
||||
|
||||
@ -22,9 +22,9 @@ pub async fn save(df: &internal::DownlinkFrame) -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn get(id: u32) -> Result<internal::DownlinkFrame, Error> {
|
||||
pub async fn get_and_del(id: u32) -> Result<internal::DownlinkFrame, Error> {
|
||||
let key = redis_key(format!("frame:{}", id));
|
||||
let v: Vec<u8> = redis::cmd("GET")
|
||||
let v: Vec<u8> = redis::cmd("GETDEL")
|
||||
.arg(key)
|
||||
.query_async(&mut get_async_redis_conn().await?)
|
||||
.await?;
|
||||
@ -53,7 +53,7 @@ pub mod test {
|
||||
};
|
||||
|
||||
save(&df).await.unwrap();
|
||||
let df_get = get(12345).await.unwrap();
|
||||
let df_get = get_and_del(12345).await.unwrap();
|
||||
assert_eq!(df, df_get);
|
||||
}
|
||||
}
|
||||
|
||||
@ -344,7 +344,7 @@ pub fn downlink_frame_saved(df: internal::DownlinkFrame) -> Validator {
|
||||
Box::new(move || {
|
||||
let df = df.clone();
|
||||
Box::pin(async move {
|
||||
let mut df_get = downlink_frame::get(*LAST_DOWNLINK_ID.read().await)
|
||||
let mut df_get = downlink_frame::get_and_del(*LAST_DOWNLINK_ID.read().await)
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
|
||||
@ -16,6 +16,7 @@ use crate::storage::{
|
||||
};
|
||||
use crate::{config, test, uplink};
|
||||
use chirpstack_api::{common, gw, internal};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, NetID, EUI64};
|
||||
|
||||
#[tokio::test]
|
||||
@ -59,7 +60,7 @@ async fn test_fns_uplink() {
|
||||
|
||||
let recv_time = Utc::now();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
gw_time: Some(recv_time.into()),
|
||||
location: Some(common::Location {
|
||||
@ -70,12 +71,6 @@ async fn test_fns_uplink() {
|
||||
}),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -154,6 +149,8 @@ async fn test_fns_uplink() {
|
||||
|
||||
// Simulate uplink
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: data_phy.to_vec().unwrap(),
|
||||
|
||||
@ -12,6 +12,7 @@ use crate::storage::{
|
||||
};
|
||||
use crate::{config, gateway::backend as gateway_backend, integration, region, test, uplink};
|
||||
use chirpstack_api::{common, gw, integration as integration_pb, internal, stream};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, DevAddr, EUI64};
|
||||
|
||||
type Function = Box<dyn Fn() -> Pin<Box<dyn Future<Output = ()>>>>;
|
||||
@ -119,29 +120,17 @@ async fn test_gateway_filtering() {
|
||||
|
||||
let ds = dev.get_device_session().unwrap();
|
||||
|
||||
let mut rx_info_a = gw::UplinkRxInfo {
|
||||
let rx_info_a = gw::UplinkRxInfo {
|
||||
gateway_id: gw_a.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_a
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info_a
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut rx_info_b = gw::UplinkRxInfo {
|
||||
let rx_info_b = gw::UplinkRxInfo {
|
||||
gateway_id: gw_b.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_b
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info_b
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -211,171 +200,6 @@ async fn test_gateway_filtering() {
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_region_config_id_filtering() {
|
||||
let _guard = test::prepare().await;
|
||||
|
||||
// We need to configure the eu868_other region.
|
||||
let region_conf = lrwn::region::get(lrwn::region::CommonName::EU868, false, false);
|
||||
region::set("eu868_other", region_conf);
|
||||
|
||||
let t = tenant::create(tenant::Tenant {
|
||||
name: "tenant".into(),
|
||||
can_have_gateways: true,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let gw = gateway::create(gateway::Gateway {
|
||||
name: "test-gw".into(),
|
||||
tenant_id: t.id,
|
||||
gateway_id: EUI64::from_be_bytes([1, 2, 3, 4, 5, 6, 7, 8]),
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let app = application::create(application::Application {
|
||||
name: "app".into(),
|
||||
tenant_id: t.id,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let dp = device_profile::create(device_profile::DeviceProfile {
|
||||
name: "test-dp".into(),
|
||||
tenant_id: t.id,
|
||||
region: lrwn::region::CommonName::EU868,
|
||||
region_config_id: Some("eu868".to_string()),
|
||||
mac_version: lrwn::region::MacVersion::LORAWAN_1_0_2,
|
||||
reg_params_revision: lrwn::region::Revision::A,
|
||||
supports_otaa: true,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let dev = device::create(device::Device {
|
||||
name: "device".into(),
|
||||
application_id: app.id,
|
||||
device_profile_id: dp.id,
|
||||
dev_eui: EUI64::from_be_bytes([2, 2, 3, 4, 5, 6, 7, 8]),
|
||||
enabled_class: DeviceClass::A,
|
||||
dev_addr: Some(DevAddr::from_be_bytes([1, 2, 3, 4])),
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info_ok = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_ok
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info_ok
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut rx_info_invalid = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_invalid
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868_other".to_string());
|
||||
rx_info_invalid
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
..Default::default()
|
||||
};
|
||||
uplink::helpers::set_uplink_modulation("eu868", &mut tx_info, 0).unwrap();
|
||||
|
||||
let ds = internal::DeviceSession {
|
||||
mac_version: common::MacVersion::Lorawan102.into(),
|
||||
dev_addr: vec![1, 2, 3, 4],
|
||||
f_nwk_s_int_key: vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
|
||||
s_nwk_s_int_key: vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
|
||||
nwk_s_enc_key: vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16],
|
||||
f_cnt_up: 7,
|
||||
n_f_cnt_down: 5,
|
||||
enabled_uplink_channel_indices: vec![0, 1, 2],
|
||||
rx1_delay: 1,
|
||||
rx2_frequency: 869525000,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let tests = vec![
|
||||
Test {
|
||||
name: "matching config id".into(),
|
||||
dev_eui: dev.dev_eui,
|
||||
device_queue_items: vec![],
|
||||
before_func: None,
|
||||
after_func: None,
|
||||
device_session: Some(ds.clone()),
|
||||
tx_info: tx_info.clone(),
|
||||
rx_info: rx_info_ok.clone(),
|
||||
phy_payload: lrwn::PhyPayload {
|
||||
mhdr: lrwn::MHDR {
|
||||
m_type: lrwn::MType::UnconfirmedDataUp,
|
||||
major: lrwn::Major::LoRaWANR1,
|
||||
},
|
||||
payload: lrwn::Payload::MACPayload(lrwn::MACPayload {
|
||||
fhdr: lrwn::FHDR {
|
||||
devaddr: lrwn::DevAddr::from_be_bytes([1, 2, 3, 4]),
|
||||
f_cnt: 7,
|
||||
..Default::default()
|
||||
},
|
||||
f_port: Some(1),
|
||||
frm_payload: None,
|
||||
}),
|
||||
mic: Some([48, 94, 26, 239]),
|
||||
},
|
||||
assert: vec![assert::f_cnt_up(dev.dev_eui, 8)],
|
||||
},
|
||||
Test {
|
||||
name: "non-matching configuration id".into(),
|
||||
dev_eui: dev.dev_eui,
|
||||
device_queue_items: vec![],
|
||||
before_func: None,
|
||||
after_func: None,
|
||||
device_session: Some(ds.clone()),
|
||||
tx_info: tx_info.clone(),
|
||||
rx_info: rx_info_invalid.clone(),
|
||||
phy_payload: lrwn::PhyPayload {
|
||||
mhdr: lrwn::MHDR {
|
||||
m_type: lrwn::MType::UnconfirmedDataUp,
|
||||
major: lrwn::Major::LoRaWANR1,
|
||||
},
|
||||
payload: lrwn::Payload::MACPayload(lrwn::MACPayload {
|
||||
fhdr: lrwn::FHDR {
|
||||
devaddr: lrwn::DevAddr::from_be_bytes([1, 2, 3, 4]),
|
||||
f_cnt: 7,
|
||||
..Default::default()
|
||||
},
|
||||
f_port: Some(1),
|
||||
frm_payload: None,
|
||||
}),
|
||||
mic: Some([48, 94, 26, 239]),
|
||||
},
|
||||
assert: vec![assert::f_cnt_up(dev.dev_eui, 7)],
|
||||
},
|
||||
];
|
||||
|
||||
for tst in &tests {
|
||||
run_test(tst).await;
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_lorawan_10_errors() {
|
||||
let _guard = test::prepare().await;
|
||||
@ -429,17 +253,11 @@ async fn test_lorawan_10_errors() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -626,17 +444,11 @@ async fn test_lorawan_11_errors() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info_freq = gw::UplinkTxInfo {
|
||||
frequency: 868300000,
|
||||
@ -781,17 +593,11 @@ async fn test_lorawan_10_skip_f_cnt() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -859,6 +665,7 @@ async fn test_lorawan_10_skip_f_cnt() {
|
||||
rx_info: vec![rx_info.clone()],
|
||||
f_cnt: 7,
|
||||
f_port: 1,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::f_cnt_up(dev.dev_eui, 8),
|
||||
@ -908,6 +715,7 @@ async fn test_lorawan_10_skip_f_cnt() {
|
||||
rx_info: vec![rx_info.clone()],
|
||||
f_cnt: 0,
|
||||
f_port: 1,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::f_cnt_up(dev.dev_eui, 1),
|
||||
@ -975,17 +783,11 @@ async fn test_lorawan_10_device_disabled() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -1098,17 +900,11 @@ async fn test_lorawan_10_uplink() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -1189,6 +985,7 @@ async fn test_lorawan_10_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -1261,6 +1058,7 @@ async fn test_lorawan_10_uplink() {
|
||||
f_port: 1,
|
||||
dr: 10,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -1340,6 +1138,7 @@ async fn test_lorawan_10_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -1391,6 +1190,7 @@ async fn test_lorawan_10_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
data: vec![],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -1443,6 +1243,7 @@ async fn test_lorawan_10_uplink() {
|
||||
dr: 0,
|
||||
confirmed: true,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -1554,6 +1355,7 @@ async fn test_lorawan_10_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
confirmed: true,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -1735,17 +1537,11 @@ async fn test_lorawan_10_end_to_end_enc() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -1838,6 +1634,7 @@ async fn test_lorawan_10_end_to_end_enc() {
|
||||
session_key_id: "010203".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
})],
|
||||
},
|
||||
@ -1892,6 +1689,7 @@ async fn test_lorawan_10_end_to_end_enc() {
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
})],
|
||||
},
|
||||
@ -1955,6 +1753,7 @@ async fn test_lorawan_10_end_to_end_enc() {
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::f_cnt_up(dev.dev_eui, 11),
|
||||
@ -2063,17 +1862,11 @@ async fn test_lorawan_11_uplink() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -2155,6 +1948,7 @@ async fn test_lorawan_11_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -2234,6 +2028,7 @@ async fn test_lorawan_11_uplink() {
|
||||
f_port: 1,
|
||||
dr: 0,
|
||||
data: vec![215, 241, 112, 52],
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -2302,17 +2097,11 @@ async fn test_lorawan_10_rx_delay() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -2392,6 +2181,7 @@ async fn test_lorawan_10_rx_delay() {
|
||||
f_port: 1,
|
||||
confirmed: true,
|
||||
dr: 0,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -2513,6 +2303,7 @@ async fn test_lorawan_10_rx_delay() {
|
||||
f_port: 1,
|
||||
confirmed: true,
|
||||
dr: 0,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -2634,6 +2425,7 @@ async fn test_lorawan_10_rx_delay() {
|
||||
f_port: 1,
|
||||
confirmed: true,
|
||||
dr: 0,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_phy_payloads(vec![
|
||||
@ -2747,17 +2539,11 @@ async fn test_lorawan_10_mac_commands() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -3118,17 +2904,11 @@ async fn test_lorawan_11_mac_commands() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -3312,17 +3092,11 @@ async fn test_lorawan_10_device_queue() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -3789,17 +3563,11 @@ async fn test_lorawan_11_device_queue() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -4270,17 +4038,11 @@ async fn test_lorawan_10_adr() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -5113,17 +4875,11 @@ async fn test_lorawan_10_device_status_request() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -5378,17 +5134,11 @@ async fn test_lorawan_11_receive_window_selection() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -5807,6 +5557,8 @@ async fn run_test(t: &Test) {
|
||||
}
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: t.phy_payload.to_vec().unwrap(),
|
||||
|
||||
@ -12,6 +12,7 @@ use crate::{
|
||||
uplink,
|
||||
};
|
||||
use chirpstack_api::{common, gw, internal};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{DevAddr, EUI64};
|
||||
|
||||
struct UplinkTest {
|
||||
@ -88,16 +89,10 @@ async fn test_uplink() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -466,6 +461,8 @@ async fn run_uplink_test(t: &UplinkTest) {
|
||||
}
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: t.phy_payload.to_vec().unwrap(),
|
||||
|
||||
@ -8,6 +8,7 @@ use crate::{
|
||||
uplink,
|
||||
};
|
||||
use chirpstack_api::{common, gw, integration as integration_pb, internal};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{DevAddr, EUI64Prefix, EUI64};
|
||||
|
||||
struct Test {
|
||||
@ -76,17 +77,11 @@ async fn test_js() {
|
||||
};
|
||||
uplink::helpers::set_uplink_modulation("eu868", &mut tx_info, 0).unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let phy = lrwn::PhyPayload {
|
||||
mhdr: lrwn::MHDR {
|
||||
@ -188,6 +183,7 @@ async fn test_js() {
|
||||
}),
|
||||
dev_addr: "01020304".into(),
|
||||
join_server_context: None,
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -255,6 +251,7 @@ async fn test_js() {
|
||||
session_key_id: "01020304".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -331,6 +328,7 @@ async fn test_js() {
|
||||
}),
|
||||
..Default::default()
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
],
|
||||
@ -371,6 +369,8 @@ async fn run_test(t: &Test) {
|
||||
gateway_backend::mock::reset().await;
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: t.phy_payload.to_vec().unwrap(),
|
||||
|
||||
@ -17,6 +17,7 @@ use crate::storage::{
|
||||
};
|
||||
use crate::{config, storage::fields, test, uplink};
|
||||
use chirpstack_api::gw;
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, EUI64Prefix, NetID, EUI64};
|
||||
|
||||
#[tokio::test]
|
||||
@ -68,18 +69,12 @@ async fn test_fns() {
|
||||
|
||||
let recv_time = Utc::now();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
gw_time: Some(recv_time.into()),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -194,6 +189,8 @@ async fn test_fns() {
|
||||
|
||||
// Simulate uplink
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: jr_phy.to_vec().unwrap(),
|
||||
|
||||
@ -15,6 +15,7 @@ use crate::{
|
||||
};
|
||||
use chirpstack_api::{common, gw, internal, stream};
|
||||
use lrwn::keys::get_js_int_key;
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, EUI64};
|
||||
|
||||
type Function = Box<dyn Fn() -> Pin<Box<dyn Future<Output = ()>>>>;
|
||||
@ -113,29 +114,17 @@ async fn test_gateway_filtering() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info_a = gw::UplinkRxInfo {
|
||||
let rx_info_a = gw::UplinkRxInfo {
|
||||
gateway_id: gw_a.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_a
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info_a
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut rx_info_b = gw::UplinkRxInfo {
|
||||
let rx_info_b = gw::UplinkRxInfo {
|
||||
gateway_id: gw_b.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info_b
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info_b
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -289,17 +278,11 @@ async fn test_lorawan_10() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -949,17 +932,11 @@ async fn test_lorawan_11() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -1277,6 +1254,8 @@ async fn run_test(t: &Test) {
|
||||
}
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: t.phy_payload.to_vec().unwrap(),
|
||||
|
||||
@ -10,6 +10,7 @@ use crate::storage::{
|
||||
};
|
||||
use crate::{gateway::backend as gateway_backend, integration, test, uplink};
|
||||
use chirpstack_api::{common, gw, integration as integration_pb, internal};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, DevAddr, EUI64};
|
||||
|
||||
struct Test {
|
||||
@ -105,17 +106,11 @@ async fn test_lorawan_10() {
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -471,6 +466,7 @@ async fn test_lorawan_10() {
|
||||
data: vec![],
|
||||
rx_info: vec![rx_info.clone()],
|
||||
tx_info: Some(tx_info.clone()),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::uplink_event(integration_pb::UplinkEvent {
|
||||
@ -500,6 +496,7 @@ async fn test_lorawan_10() {
|
||||
rssi: -100,
|
||||
wor_channel: 0,
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::no_downlink_frame(),
|
||||
@ -537,6 +534,7 @@ async fn test_lorawan_10() {
|
||||
data: vec![],
|
||||
rx_info: vec![rx_info.clone()],
|
||||
tx_info: Some(tx_info.clone()),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::uplink_event(integration_pb::UplinkEvent {
|
||||
@ -567,6 +565,7 @@ async fn test_lorawan_10() {
|
||||
rssi: -100,
|
||||
wor_channel: 0,
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -663,6 +662,7 @@ async fn test_lorawan_10() {
|
||||
data: vec![],
|
||||
rx_info: vec![rx_info.clone()],
|
||||
tx_info: Some(tx_info.clone()),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::uplink_event(integration_pb::UplinkEvent {
|
||||
@ -692,6 +692,7 @@ async fn test_lorawan_10() {
|
||||
rssi: -100,
|
||||
wor_channel: 0,
|
||||
}),
|
||||
region_config_id: "eu868".into(),
|
||||
..Default::default()
|
||||
}),
|
||||
assert::downlink_frame(gw::DownlinkFrame {
|
||||
@ -813,6 +814,8 @@ async fn run_test(t: &Test) {
|
||||
}
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: t.phy_payload.to_vec().unwrap(),
|
||||
|
||||
@ -10,6 +10,7 @@ use crate::storage::{
|
||||
};
|
||||
use crate::{gateway::backend as gateway_backend, integration, test, uplink};
|
||||
use chirpstack_api::{common, gw, internal};
|
||||
use lrwn::region::CommonName;
|
||||
use lrwn::{AES128Key, DevAddr, EUI64};
|
||||
|
||||
#[tokio::test]
|
||||
@ -120,17 +121,11 @@ async fn test_lorawan_10() {
|
||||
|
||||
let ds_relay = dev_relay.get_device_session().unwrap();
|
||||
|
||||
let mut rx_info = gw::UplinkRxInfo {
|
||||
let rx_info = gw::UplinkRxInfo {
|
||||
gateway_id: gw.gateway_id.to_string(),
|
||||
location: Some(Default::default()),
|
||||
..Default::default()
|
||||
};
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_config_id".to_string(), "eu868".to_string());
|
||||
rx_info
|
||||
.metadata
|
||||
.insert("region_common_name".to_string(), "EU868".to_string());
|
||||
|
||||
let mut tx_info = gw::UplinkTxInfo {
|
||||
frequency: 868100000,
|
||||
@ -221,6 +216,8 @@ async fn test_lorawan_10() {
|
||||
.unwrap();
|
||||
|
||||
uplink::handle_uplink(
|
||||
CommonName::EU868,
|
||||
"eu868".into(),
|
||||
Uuid::new_v4(),
|
||||
gw::UplinkFrameSet {
|
||||
phy_payload: phy_relay_jr.to_vec().unwrap(),
|
||||
|
||||
@ -6,10 +6,7 @@ use chrono::{DateTime, Duration, Local, Utc};
|
||||
use tracing::{debug, error, info, span, trace, warn, Instrument, Level};
|
||||
|
||||
use super::error::Error;
|
||||
use super::{
|
||||
data_fns, filter_rx_info_by_region_config_id, filter_rx_info_by_tenant_id, helpers,
|
||||
RelayContext, UplinkFrameSet,
|
||||
};
|
||||
use super::{data_fns, filter_rx_info_by_tenant_id, helpers, RelayContext, UplinkFrameSet};
|
||||
use crate::api::helpers::ToProto;
|
||||
use crate::backend::roaming;
|
||||
use crate::helpers::errors::PrintFullError;
|
||||
@ -124,7 +121,6 @@ impl Data {
|
||||
// In case of roaming we do not know the gateways and therefore it must not be
|
||||
// filtered.
|
||||
ctx.filter_rx_info_by_tenant().await?;
|
||||
ctx.filter_rx_info_by_region_config_id()?;
|
||||
}
|
||||
ctx.set_device_info()?;
|
||||
ctx.set_device_gateway_rx_info()?;
|
||||
@ -238,6 +234,7 @@ impl Data {
|
||||
};
|
||||
|
||||
match device::get_for_phypayload_and_incr_f_cnt_up(
|
||||
&self.uplink_frame_set.region_config_id,
|
||||
false,
|
||||
&mut self.phy_payload,
|
||||
self.uplink_frame_set.dr,
|
||||
@ -305,8 +302,14 @@ impl Data {
|
||||
dr,
|
||||
)? as u8;
|
||||
|
||||
match device::get_for_phypayload_and_incr_f_cnt_up(true, &mut self.phy_payload, dr, ch)
|
||||
.await
|
||||
match device::get_for_phypayload_and_incr_f_cnt_up(
|
||||
&self.uplink_frame_set.region_config_id,
|
||||
true,
|
||||
&mut self.phy_payload,
|
||||
dr,
|
||||
ch,
|
||||
)
|
||||
.await
|
||||
{
|
||||
Ok(v) => match v {
|
||||
device::ValidationStatus::Ok(f_cnt, d) => {
|
||||
@ -572,17 +575,6 @@ impl Data {
|
||||
}
|
||||
}
|
||||
|
||||
fn filter_rx_info_by_region_config_id(&mut self) -> Result<()> {
|
||||
trace!("Filtering rx_info by region_config_id");
|
||||
|
||||
let dp = self.device_profile.as_ref().unwrap();
|
||||
if let Some(v) = &dp.region_config_id {
|
||||
filter_rx_info_by_region_config_id(v, &mut self.uplink_frame_set)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn decrypt_f_opts_mac_commands(&mut self) -> Result<()> {
|
||||
trace!("Decrypting mac-commands");
|
||||
let ds = self.device.as_ref().unwrap().get_device_session()?;
|
||||
@ -958,6 +950,7 @@ impl Data {
|
||||
} else {
|
||||
None
|
||||
},
|
||||
region_config_id: self.uplink_frame_set.region_config_id.clone(),
|
||||
};
|
||||
|
||||
if !self._is_end_to_end_encrypted() {
|
||||
|
||||
@ -12,10 +12,7 @@ use lrwn::{
|
||||
|
||||
use super::error::Error;
|
||||
use super::join_fns;
|
||||
use super::{
|
||||
filter_rx_info_by_region_config_id, filter_rx_info_by_tenant_id, helpers, RelayContext,
|
||||
UplinkFrameSet,
|
||||
};
|
||||
use super::{filter_rx_info_by_tenant_id, helpers, RelayContext, UplinkFrameSet};
|
||||
|
||||
use crate::api::{backend::get_async_receiver, helpers::ToProto};
|
||||
use crate::backend::{joinserver, keywrap, roaming};
|
||||
@ -119,8 +116,8 @@ impl JoinRequest {
|
||||
ctx.get_device_data_or_try_pr_roaming().await?;
|
||||
ctx.get_device_keys_or_js_client().await?; // used to validate MIC + if we need external JS
|
||||
ctx.set_device_info()?;
|
||||
ctx.validate_region_config_id()?;
|
||||
ctx.filter_rx_info_by_tenant()?;
|
||||
ctx.filter_rx_info_by_region_config_id()?;
|
||||
ctx.abort_on_device_is_disabled()?;
|
||||
ctx.abort_on_relay_only_comm()?;
|
||||
ctx.log_uplink_frame_set().await?;
|
||||
@ -337,6 +334,20 @@ impl JoinRequest {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn validate_region_config_id(&self) -> Result<(), Error> {
|
||||
trace!("Validating region_config_id against device-profile");
|
||||
|
||||
let dp = self.device_profile.as_ref().unwrap();
|
||||
if let Some(v) = &dp.region_config_id {
|
||||
if !self.uplink_frame_set.region_config_id.eq(v) {
|
||||
warn!("Aborting as region config ID does not match with device-profile");
|
||||
return Err(Error::Abort);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn filter_rx_info_by_tenant(&mut self) -> Result<()> {
|
||||
trace!("Filtering rx_info by tenant_id");
|
||||
|
||||
@ -347,17 +358,6 @@ impl JoinRequest {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn filter_rx_info_by_region_config_id(&mut self) -> Result<()> {
|
||||
trace!("Filtering rx_info by region_config_id");
|
||||
|
||||
let dp = self.device_profile.as_ref().unwrap();
|
||||
if let Some(v) = &dp.region_config_id {
|
||||
filter_rx_info_by_region_config_id(v, &mut self.uplink_frame_set)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn log_uplink_frame_set(&self) -> Result<()> {
|
||||
trace!("Logging uplink frame-set");
|
||||
let ufl: stream_pb::UplinkFrameLog = (&self.uplink_frame_set).try_into()?;
|
||||
@ -955,6 +955,7 @@ impl JoinRequest {
|
||||
} else {
|
||||
None
|
||||
},
|
||||
region_config_id: self.uplink_frame_set.region_config_id.clone(),
|
||||
};
|
||||
|
||||
integration::join_event(app.id.into(), &dev.variables, &pl).await;
|
||||
|
||||
@ -705,6 +705,7 @@ impl JoinRequest {
|
||||
} else {
|
||||
None
|
||||
},
|
||||
region_config_id: self.uplink_frame_set.region_config_id.clone(),
|
||||
};
|
||||
|
||||
integration::join_event(app.id.into(), &dev.variables, &pl).await;
|
||||
|
||||
@ -156,21 +156,35 @@ pub struct RoamingMetaData {
|
||||
pub ul_meta_data: backend::ULMetaData,
|
||||
}
|
||||
|
||||
pub async fn deduplicate_uplink(event: gw::UplinkFrame) {
|
||||
if let Err(e) = _deduplicate_uplink(event).await {
|
||||
pub async fn deduplicate_uplink(
|
||||
region_common_name: CommonName,
|
||||
region_config_id: String,
|
||||
event: gw::UplinkFrame,
|
||||
) {
|
||||
if let Err(e) = _deduplicate_uplink(region_common_name, ®ion_config_id, event).await {
|
||||
error!(error = %e.full(), "Deduplication error");
|
||||
}
|
||||
}
|
||||
|
||||
async fn _deduplicate_uplink(event: gw::UplinkFrame) -> Result<()> {
|
||||
async fn _deduplicate_uplink(
|
||||
region_common_name: CommonName,
|
||||
region_config_id: &str,
|
||||
event: gw::UplinkFrame,
|
||||
) -> Result<()> {
|
||||
let phy_str = hex::encode(&event.phy_payload);
|
||||
let tx_info_str = match &event.tx_info {
|
||||
Some(tx_info) => hex::encode(tx_info.encode_to_vec()),
|
||||
None => "".to_string(),
|
||||
};
|
||||
|
||||
let key = redis_key(format!("up:collect:{{{}:{}}}", tx_info_str, phy_str));
|
||||
let lock_key = redis_key(format!("up:collect:{{{}:{}}}:lock", tx_info_str, phy_str));
|
||||
let key = redis_key(format!(
|
||||
"up:collect:{{{}:{}:{}}}",
|
||||
region_config_id, tx_info_str, phy_str
|
||||
));
|
||||
let lock_key = redis_key(format!(
|
||||
"up:collect:{{{}:{}:{}}}:lock",
|
||||
region_config_id, tx_info_str, phy_str
|
||||
));
|
||||
|
||||
let dedup_delay = config::get().network.deduplication_delay;
|
||||
let mut dedup_ttl = dedup_delay * 2;
|
||||
@ -207,9 +221,14 @@ async fn _deduplicate_uplink(event: gw::UplinkFrame) -> Result<()> {
|
||||
|
||||
let deduplication_id = Uuid::new_v4();
|
||||
let span = span!(Level::INFO, "up", deduplication_id = %deduplication_id);
|
||||
handle_uplink(deduplication_id, uplink)
|
||||
.instrument(span)
|
||||
.await?;
|
||||
handle_uplink(
|
||||
region_common_name,
|
||||
region_config_id,
|
||||
deduplication_id,
|
||||
uplink,
|
||||
)
|
||||
.instrument(span)
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@ -283,30 +302,16 @@ async fn deduplicate_collect(key: &str) -> Result<gw::UplinkFrameSet> {
|
||||
Ok(pl)
|
||||
}
|
||||
|
||||
pub async fn handle_uplink(deduplication_id: Uuid, uplink: gw::UplinkFrameSet) -> Result<()> {
|
||||
let rx_info = &uplink
|
||||
.rx_info
|
||||
.first()
|
||||
.context("Unable to get first item from rx_info")?;
|
||||
|
||||
let region_config_id = rx_info
|
||||
.metadata
|
||||
.get("region_config_id")
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
|
||||
let common_name = rx_info
|
||||
.metadata
|
||||
.get("region_common_name")
|
||||
.cloned()
|
||||
.unwrap_or_default();
|
||||
|
||||
let common_name = CommonName::from_str(&common_name)?;
|
||||
|
||||
pub async fn handle_uplink(
|
||||
region_common_name: CommonName,
|
||||
region_config_id: &str,
|
||||
deduplication_id: Uuid,
|
||||
uplink: gw::UplinkFrameSet,
|
||||
) -> Result<()> {
|
||||
let mut uplink = UplinkFrameSet {
|
||||
uplink_set_id: deduplication_id,
|
||||
region_config_id,
|
||||
region_common_name: common_name,
|
||||
region_common_name,
|
||||
region_config_id: region_config_id.to_string(),
|
||||
dr: 0,
|
||||
ch: 0,
|
||||
phy_payload: PhyPayload::from_slice(&uplink.phy_payload)?,
|
||||
@ -409,16 +414,11 @@ async fn update_gateway_metadata(ufs: &mut UplinkFrameSet) -> Result<()> {
|
||||
}
|
||||
|
||||
fn filter_rx_info_by_tenant_id(tenant_id: Uuid, uplink: &mut UplinkFrameSet) -> Result<()> {
|
||||
let force_gws_private = config::get_force_gws_private(&uplink.region_config_id)?;
|
||||
let mut rx_info_set: Vec<gw::UplinkRxInfo> = Vec::new();
|
||||
|
||||
for rx_info in &uplink.rx_info_set {
|
||||
let gateway_id = EUI64::from_str(&rx_info.gateway_id).context("Gateway ID")?;
|
||||
let region_config_id = rx_info
|
||||
.metadata
|
||||
.get("region_config_id")
|
||||
.map(|v| v.to_string())
|
||||
.ok_or_else(|| anyhow!("No region_config_id in rx_info metadata"))?;
|
||||
let force_gws_private = config::get_force_gws_private(®ion_config_id)?;
|
||||
|
||||
if !(uplink
|
||||
.gateway_private_up_map
|
||||
@ -466,25 +466,3 @@ fn filter_rx_info_by_public_only(uplink: &mut UplinkFrameSet) -> Result<()> {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn filter_rx_info_by_region_config_id(
|
||||
region_config_id: &str,
|
||||
uplink: &mut UplinkFrameSet,
|
||||
) -> Result<()> {
|
||||
let mut rx_info_set: Vec<gw::UplinkRxInfo> = Vec::new();
|
||||
|
||||
for rx_info in &uplink.rx_info_set {
|
||||
if let Some(v) = rx_info.metadata.get("region_config_id") {
|
||||
if v == region_config_id {
|
||||
rx_info_set.push(rx_info.clone());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
uplink.rx_info_set = rx_info_set;
|
||||
if uplink.rx_info_set.is_empty() {
|
||||
return Err(anyhow!("rx_info_set is empty"));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
description = "Library for filtering LoRaWAN payloads on DevAddr and JoinEUIs prefixes"
|
||||
homepage = "https://www.chirpstack.io/"
|
||||
license = "MIT"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
edition = "2021"
|
||||
repository = "https://github.com/chirpstack/chirpstack"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
description = "Library for encoding / decoding LoRaWAN frames."
|
||||
homepage = "https://www.chirpstack.io"
|
||||
license = "MIT"
|
||||
version = "4.10.2"
|
||||
version = "4.11.0-test.1"
|
||||
authors = ["Orne Brocaar <info@brocaar.com>"]
|
||||
edition = "2018"
|
||||
repository = "https://github.com/chirpstack/chirpstack"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "chirpstack-ui",
|
||||
"version": "4.10.2",
|
||||
"version": "4.11.0-test.1",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
Reference in New Issue
Block a user