From 1496698e457e80055b694b7202e441468e3bc4b3 Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Wed, 27 Sep 2023 13:00:26 +0100 Subject: [PATCH 1/6] extend enum to support bad cell type --- src/service/poc_mobile.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 4db94514..14155915 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -247,6 +247,8 @@ enum heartbeat_validity { heartbeat_validity_too_far_from_coverage = 9; // Gateway is not asserted heartbeat_validity_gateway_not_asserted = 10; + // Heartbeat cell type does not match asserted cell type + heartbeat_validity_bad_cell_type = 10; } message seniority_update { From 4449ad6c1dc70720f5b4f6124c0c14fa5cc983a2 Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Wed, 27 Sep 2023 16:31:02 +0100 Subject: [PATCH 2/6] fix enum value --- src/service/mobile_config.proto | 2 ++ src/service/poc_mobile.proto | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/service/mobile_config.proto b/src/service/mobile_config.proto index 1b598c04..bf2b6d23 100644 --- a/src/service/mobile_config.proto +++ b/src/service/mobile_config.proto @@ -21,6 +21,8 @@ message gateway_metadata { // The res12 h3 index asserted address of the gateway as a string // where an unasserted gateway returns an empty string string location = 2; + // + string device_type = 3; } message gateway_info { diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 14155915..9807851b 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -248,7 +248,7 @@ enum heartbeat_validity { // Gateway is not asserted heartbeat_validity_gateway_not_asserted = 10; // Heartbeat cell type does not match asserted cell type - heartbeat_validity_bad_cell_type = 10; + heartbeat_validity_bad_cell_type = 11; } message seniority_update { From bb4d1a49743667db4aabb68ba6a71f862cf9710f Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Fri, 17 Nov 2023 13:51:14 +0000 Subject: [PATCH 3/6] add comment --- src/service/mobile_config.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/mobile_config.proto b/src/service/mobile_config.proto index bf2b6d23..f8afe39d 100644 --- a/src/service/mobile_config.proto +++ b/src/service/mobile_config.proto @@ -21,7 +21,7 @@ message gateway_metadata { // The res12 h3 index asserted address of the gateway as a string // where an unasserted gateway returns an empty string string location = 2; - // + // the asserted device type of the gateway string device_type = 3; } From 250579e59dd9731c5c85fcd011be13796f6e6d4e Mon Sep 17 00:00:00 2001 From: Andrew McKenzie Date: Thu, 7 Dec 2023 14:12:55 +0000 Subject: [PATCH 4/6] use enum for device type --- src/service/mobile_config.proto | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/service/mobile_config.proto b/src/service/mobile_config.proto index f8afe39d..4e052f8d 100644 --- a/src/service/mobile_config.proto +++ b/src/service/mobile_config.proto @@ -21,8 +21,6 @@ message gateway_metadata { // The res12 h3 index asserted address of the gateway as a string // where an unasserted gateway returns an empty string string location = 2; - // the asserted device type of the gateway - string device_type = 3; } message gateway_info { @@ -30,6 +28,8 @@ message gateway_info { bytes address = 1; // The gateway metadata as recorded on the blockchain gateway_metadata metadata = 2; + // the asserted device type of the gateway + device_type device_type = 3; } message gateway_info_req_v1 { @@ -103,6 +103,11 @@ enum network_key_role { mobile_pcs = 2; } +enum device_type { + cbrs = 0; + wifi_indoor = 1; +} + message authorization_verify_req_v1 { // the pubkey binary of the authorized entity being verified bytes pubkey = 1; From 867ca9cc1e53edf96345e378a27f2497e04ecd07 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Wed, 13 Dec 2023 17:00:03 -0500 Subject: [PATCH 5/6] move device type to metadata --- src/service/mobile_config.proto | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/service/mobile_config.proto b/src/service/mobile_config.proto index 4e052f8d..1efeb015 100644 --- a/src/service/mobile_config.proto +++ b/src/service/mobile_config.proto @@ -21,6 +21,8 @@ message gateway_metadata { // The res12 h3 index asserted address of the gateway as a string // where an unasserted gateway returns an empty string string location = 2; + // the asserted device type of the gateway + device_type device_type = 3; } message gateway_info { @@ -28,8 +30,6 @@ message gateway_info { bytes address = 1; // The gateway metadata as recorded on the blockchain gateway_metadata metadata = 2; - // the asserted device type of the gateway - device_type device_type = 3; } message gateway_info_req_v1 { @@ -106,6 +106,7 @@ enum network_key_role { enum device_type { cbrs = 0; wifi_indoor = 1; + wifi_outdoor = 2; } message authorization_verify_req_v1 { From 72db6a5c3cd8b7853b6f8a67c8ed468b903df9d8 Mon Sep 17 00:00:00 2001 From: jeffgrunewald Date: Thu, 14 Dec 2023 12:23:39 -0500 Subject: [PATCH 6/6] move the device type back --- src/service/mobile_config.proto | 4 ++-- src/service/poc_mobile.proto | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/service/mobile_config.proto b/src/service/mobile_config.proto index 1efeb015..8dc6ee56 100644 --- a/src/service/mobile_config.proto +++ b/src/service/mobile_config.proto @@ -21,8 +21,6 @@ message gateway_metadata { // The res12 h3 index asserted address of the gateway as a string // where an unasserted gateway returns an empty string string location = 2; - // the asserted device type of the gateway - device_type device_type = 3; } message gateway_info { @@ -30,6 +28,8 @@ message gateway_info { bytes address = 1; // The gateway metadata as recorded on the blockchain gateway_metadata metadata = 2; + // the asserted device type of the gateway + device_type device_type = 3; } message gateway_info_req_v1 { diff --git a/src/service/poc_mobile.proto b/src/service/poc_mobile.proto index 9807851b..4db94514 100644 --- a/src/service/poc_mobile.proto +++ b/src/service/poc_mobile.proto @@ -247,8 +247,6 @@ enum heartbeat_validity { heartbeat_validity_too_far_from_coverage = 9; // Gateway is not asserted heartbeat_validity_gateway_not_asserted = 10; - // Heartbeat cell type does not match asserted cell type - heartbeat_validity_bad_cell_type = 11; } message seniority_update {