diff options
| author | Brian Gix <brian.gix@intel.com> | 2018-09-18 12:40:08 -0700 |
|---|---|---|
| committer | Brian Gix <brian.gix@intel.com> | 2018-10-03 13:42:52 -0700 |
| commit | 994932b740c7a31a55fe11aa98e00ad2bb392b4e (patch) | |
| tree | 08b1c04aead39be005afc3b250b964834e560783 /mesh/net.h | |
| parent | df337d8d50273c36367757419a8918dc3870bad9 (diff) | |
| download | bluez-994932b740c7a31a55fe11aa98e00ad2bb392b4e.tar.gz | |
mesh: Refactor friend.c and net.c for central key DB
To enable multiple local nodes and friendships to
coexist, and minimize redundant encryption processing
Diffstat (limited to 'mesh/net.h')
| -rw-r--r-- | mesh/net.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mesh/net.h b/mesh/net.h index e48380314..b8eb0699d 100644 --- a/mesh/net.h +++ b/mesh/net.h @@ -183,12 +183,12 @@ struct mesh_friend { uint16_t *grp_list; uint32_t poll_timeout; uint32_t last_hdr; + uint32_t net_key_cur; + uint32_t net_key_upd; uint16_t dst; /* Primary Element unicast addr */ uint16_t fn_cnt; uint16_t lp_cnt; int16_t grp_cnt; - struct mesh_key_set key_set; - struct mesh_key_set new_key_set; uint8_t ele_cnt; uint8_t frd; uint8_t frw; @@ -283,8 +283,6 @@ bool mesh_net_set_proxy_mode(struct mesh_net *net, bool enable); bool mesh_net_set_relay_mode(struct mesh_net *net, bool enable, uint8_t cnt, uint8_t interval); bool mesh_net_set_friend_mode(struct mesh_net *net, bool enable); -bool mesh_net_add_keyset(struct mesh_net *net, struct mesh_key_set *key_set); -bool mesh_net_remove_keyset(struct mesh_net *net, struct mesh_key_set *key_set); int mesh_net_del_key(struct mesh_net *net, uint16_t net_idx); int mesh_net_add_key(struct mesh_net *net, bool update, uint16_t net_idx, const void *key); @@ -292,13 +290,13 @@ uint32_t mesh_net_get_iv_index(struct mesh_net *net); void mesh_net_get_snb_state(struct mesh_net *net, uint8_t *flags, uint32_t *iv_index); bool mesh_net_get_key(struct mesh_net *net, bool new_key, uint16_t idx, - uint8_t key[16]); + uint32_t *key_id); bool mesh_net_attach(struct mesh_net *net, struct mesh_io *io); struct mesh_io *mesh_net_detach(struct mesh_net *net); struct l_queue *mesh_net_get_app_keys(struct mesh_net *net); bool mesh_net_flush(struct mesh_net *net); -void mesh_net_transport_send(struct mesh_net *net, struct mesh_key_set *key_set, +void mesh_net_transport_send(struct mesh_net *net, uint32_t key_id, bool fast, uint32_t iv_index, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dst, const uint8_t *msg, uint16_t msg_len); @@ -310,7 +308,7 @@ unsigned int mesh_net_app_send(struct mesh_net *net, bool frnd_cred, mesh_net_status_func_t status_func, void *user_data); void mesh_net_app_send_cancel(struct mesh_net *net, unsigned int id); -void mesh_net_ack_send(struct mesh_net *net, struct mesh_key_set *key_set, +void mesh_net_ack_send(struct mesh_net *net, uint32_t key_id, uint32_t iv_index, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dst, bool rly, uint16_t seqZero, uint32_t ack_flags); @@ -346,7 +344,7 @@ int mesh_net_kr_phase_one(struct mesh_net *net, uint16_t net_idx, const uint8_t *key); int mesh_net_key_refresh_phase_two(struct mesh_net *net, uint16_t net_idx); int mesh_net_key_refresh_finish(struct mesh_net *net, uint16_t net_idx); -void mesh_net_send_seg(struct mesh_net *net, struct mesh_key_set *key_set, +void mesh_net_send_seg(struct mesh_net *net, uint32_t key_id, uint32_t iv_index, uint8_t ttl, uint32_t seq, uint16_t src, uint16_t dst, uint32_t hdr, const void *seg, uint16_t seg_len); |