From: Inga Stotland <inga.stotland@intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: brian.gix@intel.com, Inga Stotland <inga.stotland@intel.com>
Subject: [PATCH BlueZ 05/10] mesh: Clean up handling of config net and app key messages
Date: Thu, 30 Jul 2020 13:38:46 -0700 [thread overview]
Message-ID: <20200730203851.32043-6-inga.stotland@intel.com> (raw)
In-Reply-To: <20200730203851.32043-1-inga.stotland@intel.com>
This modification allows using a single point for sending out
the composed status messages by the Config Server.
---
mesh/cfgmod-server.c | 147 ++++++++++++++++++++++---------------------
1 file changed, 75 insertions(+), 72 deletions(-)
diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index 871ecf878..67e320eda 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -541,6 +541,73 @@ static void node_reset(void *user_data)
node_remove(node);
}
+static uint16_t cfg_appkey_msg(struct mesh_node *node, const uint8_t *pkt,
+ int opcode)
+{
+ uint16_t n_idx, a_idx, n;
+ struct mesh_net *net = node_get_net(node);
+
+ n_idx = l_get_le16(pkt) & 0xfff;
+ a_idx = l_get_le16(pkt + 1) >> 4;
+
+ n = mesh_model_opcode_set(OP_APPKEY_STATUS, msg);
+
+ if (opcode == OP_APPKEY_ADD)
+ msg[n] = appkey_key_add(net, n_idx, a_idx, pkt + 3);
+ else if (opcode == OP_APPKEY_UPDATE)
+ msg[n] = appkey_key_update(net, n_idx, a_idx, pkt + 3);
+ else
+ msg[n] = appkey_key_delete(net, n_idx, a_idx);
+
+ l_debug("AppKey Command %s: Net_Idx %3.3x, App_Idx %3.3x",
+ (msg[n] == MESH_STATUS_SUCCESS) ? "success" : "fail",
+ n_idx, a_idx);
+
+ memcpy(msg + n + 1, &pkt[0], 3);
+
+ return n + 4;
+}
+
+static uint16_t cfg_netkey_msg(struct mesh_node *node, const uint8_t *pkt,
+ int opcode)
+{
+ uint16_t n_idx, n;
+ struct mesh_net *net = node_get_net(node);
+
+ n_idx = l_get_le16(pkt);
+ n = mesh_model_opcode_set(OP_NETKEY_STATUS, msg);
+
+ if (opcode == OP_NETKEY_ADD)
+ msg[n] = mesh_net_add_key(net, n_idx, pkt + 2);
+ else if (opcode == OP_NETKEY_UPDATE)
+ msg[n] = mesh_net_update_key(net, n_idx, pkt + 2);
+ else
+ msg[n] = mesh_net_del_key(net, n_idx);
+
+ l_debug("NetKey Command %s: Net_Idx %3.3x",
+ (msg[n] == MESH_STATUS_SUCCESS) ? "success" : "fail",
+ n_idx);
+
+ memcpy(msg + n + 1, &pkt[0], 2);
+
+ return n + 3;
+}
+
+static uint16_t cfg_get_appkeys_msg(struct mesh_node *node, const uint8_t *pkt)
+{
+ uint16_t n_idx, sz, n;
+
+ n_idx = l_get_le16(pkt);
+
+ n = mesh_model_opcode_set(OP_APPKEY_LIST, msg);
+ l_put_le16(n_idx, msg + n + 1);
+
+ msg[n] = appkey_list(node_get_net(node), n_idx, msg + n + 3,
+ MAX_MSG_LEN - (n + 3), &sz);
+
+ return n + 3 + sz;
+}
+
static uint16_t get_composition(struct mesh_node *node, uint8_t page,
uint8_t *buf)
{
@@ -579,7 +646,7 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx,
uint32_t opcode, tmp32;
int b_res = MESH_STATUS_SUCCESS;
struct mesh_net_heartbeat *hb;
- uint16_t n_idx, a_idx;
+ uint16_t n_idx;
uint8_t state, status;
uint8_t phase;
bool virt = false;
@@ -850,60 +917,19 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx,
if (size != 19)
return true;
- n_idx = l_get_le16(pkt) & 0xfff;
- a_idx = l_get_le16(pkt + 1) >> 4;
-
- if (opcode == OP_APPKEY_ADD)
- b_res = appkey_key_add(net, n_idx, a_idx, pkt + 3);
- else
- b_res = appkey_key_update(net, n_idx, a_idx,
- pkt + 3);
-
- l_debug("Add/Update AppKey %s: Net_Idx %3.3x, App_Idx %3.3x",
- (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail",
- n_idx, a_idx);
-
-
- n = mesh_model_opcode_set(OP_APPKEY_STATUS, msg);
-
- msg[n++] = b_res;
- msg[n++] = pkt[0];
- msg[n++] = pkt[1];
- msg[n++] = pkt[2];
- break;
-
+ /* Fall Through */
case OP_APPKEY_DELETE:
- if (size != 3)
+ if (opcode == OP_APPKEY_DELETE && size != 3)
return true;
- n_idx = l_get_le16(pkt) & 0xfff;
- a_idx = l_get_le16(pkt + 1) >> 4;
- b_res = appkey_key_delete(net, n_idx, a_idx);
- l_debug("Delete AppKey %s Net_Idx %3.3x to App_Idx %3.3x",
- (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail",
- n_idx, a_idx);
-
- n = mesh_model_opcode_set(OP_APPKEY_STATUS, msg);
- msg[n++] = b_res;
- msg[n++] = pkt[0];
- msg[n++] = pkt[1];
- msg[n++] = pkt[2];
+ n = cfg_appkey_msg(node, pkt, opcode);
break;
case OP_APPKEY_GET:
if (size != 2)
return true;
- n_idx = l_get_le16(pkt);
-
- n = mesh_model_opcode_set(OP_APPKEY_LIST, msg);
-
- status = appkey_list(net, n_idx, msg + n + 3,
- MAX_MSG_LEN - n - 3, &size);
-
- msg[n] = status;
- l_put_le16(n_idx, msg + n + 1);
- n += (size + 3);
+ n = cfg_get_appkeys_msg(node, pkt);
break;
case OP_NETKEY_ADD:
@@ -911,35 +937,12 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx,
if (size != 18)
return true;
- n_idx = l_get_le16(pkt);
-
- if (opcode == OP_NETKEY_ADD)
- b_res = mesh_net_add_key(net, n_idx, pkt + 2);
- else
- b_res = mesh_net_update_key(net, n_idx, pkt + 2);
-
- l_debug("NetKey Add/Update %s",
- (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail");
-
- n = mesh_model_opcode_set(OP_NETKEY_STATUS, msg);
- msg[n++] = b_res;
- l_put_le16(l_get_le16(pkt), msg + n);
- n += 2;
- break;
-
+ /* Fall Through */
case OP_NETKEY_DELETE:
- if (size != 2)
+ if (opcode == OP_NETKEY_DELETE && size != 2)
return true;
- b_res = mesh_net_del_key(net, l_get_le16(pkt));
-
- l_debug("NetKey delete %s",
- (b_res == MESH_STATUS_SUCCESS) ? "success" : "fail");
-
- n = mesh_model_opcode_set(OP_NETKEY_STATUS, msg);
- msg[n++] = b_res;
- l_put_le16(l_get_le16(pkt), msg + n);
- n += 2;
+ n = cfg_netkey_msg(node, pkt, opcode);
break;
case OP_NETKEY_GET:
--
2.26.2
next prev parent reply other threads:[~2020-07-30 20:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 20:38 [PATCH BlueZ 00/10] Clean up Config Server Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 01/10] mesh: Clean up handling of config subscription messages Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 02/10] mesh: Clean up handling of config model binding messages Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 03/10] mesh: Clean up handling of config node identity message Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 04/10] mesh: Clean up handling of config publication messages Inga Stotland
2020-07-30 20:38 ` Inga Stotland [this message]
2020-07-30 20:38 ` [PATCH BlueZ 06/10] mesh: Clean up handling of config relay messages Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 07/10] mesh: Clean up handling of config poll timeout message Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 08/10] mesh: Clean up handling of config net transmit messages Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 09/10] mesh: Clean up handling of config KR phase messages Inga Stotland
2020-07-30 20:38 ` [PATCH BlueZ 10/10] mesh: Refactor heartbeat pub/sub Inga Stotland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200730203851.32043-6-inga.stotland@intel.com \
--to=inga.stotland@intel.com \
--cc=brian.gix@intel.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).