diff options
| author | Michał Lowas-Rzechonek <michal.lowas-rzechonek@silvair.com> | 2022-02-03 15:38:49 +0100 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2022-02-04 12:12:27 -0800 |
| commit | 7083cad2fb42fbd9640ee55df4225d921a83e2d0 (patch) | |
| tree | 9363e5fae25b60299e613afb9252a210662ba3fc /mesh/friend.c | |
| parent | c2c0bff891927d9a7ed3820671822ffab5f0f556 (diff) | |
| download | bluez-7083cad2fb42fbd9640ee55df4225d921a83e2d0.tar.gz | |
mesh: Make key_aid and net_key_id naming consistent
- key_aid refers to application key AID
- net_key_id refers to unique, internal id of the network key, used in
net-keys.h
Also, remove unused mesh_frnd_pkt struct.
Diffstat (limited to 'mesh/friend.c')
| -rw-r--r-- | mesh/friend.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesh/friend.c b/mesh/friend.c index 1e67704b8..6c63032ac 100644 --- a/mesh/friend.c +++ b/mesh/friend.c @@ -59,7 +59,7 @@ static void response_delay(struct l_timeout *timeout, void *user_data) { struct mesh_friend *neg = user_data; uint16_t net_idx = neg->net_idx; - uint32_t key_id, seq; + uint32_t net_key_id, seq; uint8_t msg[8]; uint16_t n = 0; bool res; @@ -67,11 +67,11 @@ static void response_delay(struct l_timeout *timeout, void *user_data) l_timeout_remove(timeout); /* Create key Set for this offer */ - res = mesh_net_get_key(neg->net, false, net_idx, &key_id); + res = mesh_net_get_key(neg->net, false, net_idx, &net_key_id); if (!res) goto cleanup; - neg->net_key_cur = net_key_frnd_add(key_id, neg->lp_addr, + neg->net_key_cur = net_key_frnd_add(net_key_id, neg->lp_addr, mesh_net_get_address(neg->net), neg->lp_cnt, counter); if (!neg->net_key_cur) @@ -88,7 +88,7 @@ static void response_delay(struct l_timeout *timeout, void *user_data) n += 2; seq = mesh_net_next_seq_num(neg->net); print_packet("Tx-NET_OP_FRND_OFFER", msg, n); - mesh_net_transport_send(neg->net, key_id, 0, + mesh_net_transport_send(neg->net, net_key_id, 0, mesh_net_get_iv_index(neg->net), 0, seq, 0, neg->lp_addr, msg, n); |