Skip to content

Commit

Permalink
Resolving comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@debdeep-arm
debdeep-arm authored and Arto Kinnunen committed Aug 26, 2020
1 parent 68cf724 commit c017215
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 58 deletions.
11 changes: 4 additions & 7 deletions connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunBorderRouter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
* \brief Struct br_information Border router dynamic information.
*/
typedef struct ws_br_info {
/** Mesh Interface Global Address */
uint8_t global_addr[16];
/** Mesh Interface Link Local Address */
uint8_t link_local_addr[16];
/** Address prefix given to devices in network set to 0 if not available*/
uint8_t ipv6_prefix[8];
/** IID of Border router */
uint8_t ipv6_iid[8];
/** Border router dodag id */
uint8_t rpl_dodag_id[16];
/** Border router instance identifier defined in RPL */
Expand All @@ -35,8 +35,6 @@ typedef struct ws_br_info {
uint64_t host_timestamp;
/** Amount of devices in the network. */
uint16_t device_count;
/** Backbone IPv6 Global Address */
uint8_t backbone_global_addr[16];
/** Gateway Local Address */
uint8_t gateway_addr[16];
} ws_br_info_t;
Expand Down Expand Up @@ -213,7 +211,6 @@ class WisunBorderRouter {

private:
int8_t _mesh_if_id = -1;
int8_t _backbone_if_id = -1;

};

Expand Down
32 changes: 18 additions & 14 deletions connectivity/nanostack/mbed-mesh-api/mbed-mesh-api/WisunInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
* \brief Struct ws_rpl_info Wi-SUN router RPL information.
*/
typedef struct ws_rpl_info {
/** IPv6 Global Address of Router Node*/
uint8_t global_addr[16];
/** IPv6 Link Local Address of Router Node*/
uint8_t link_local_addr[16];
/** Router dodag id */
uint8_t rpl_dodag_id[16];
/** Router instance identifier */
Expand All @@ -37,19 +33,27 @@ typedef struct ws_rpl_info {
uint16_t curent_rank;
/** RPL Primary Parent Rank */
uint16_t primary_parent_rank;
/** RPL Primary Parent Address */
uint8_t rpl_parent_addr[16];
} ws_rpl_info_t;

/**
* \brief Struct ws_radio_info Wi-SUN router Radio Quality information.
* \brief Struct ws_stack_state Wi-SUN stack information.
*/
typedef struct ws_radio_info {
/** parent RSSI in measured RSSI value calculated using EWMA specified by Wi-SUN from range of -174 (0) to +80 (254) dBm.*/
uint8_t rsl_in;
typedef struct ws_stack_state {
/** Mesh Interface Global IPv6 Address */
uint8_t global_addr[16];
/** Mesh Interface Link Local IPv6 Address */
uint8_t link_local_addr[16];
/** Parent link local address */
uint8_t parent_addr[16];
/** parent RSSI Out measured RSSI value calculated using EWMA specified by Wi-SUN from range of -174 (0) to +80 (254) dBm.*/
uint8_t rsl_out;
} ws_radio_info_t;
/** parent RSSI in measured RSSI value calculated using EWMA specified by Wi-SUN from range of -174 (0) to +80 (254) dBm.*/
uint8_t rsl_in;
/** Wi-SUN join state defined by Wi-SUN specification 1-5 */
uint8_t join_state;
/** Network PAN ID */
uint16_t pan_id;
} ws_stack_state_t;

/** Wi-SUN mesh network interface class
*
Expand Down Expand Up @@ -470,17 +474,17 @@ class WisunInterface final : public MeshInterfaceNanostack {
mesh_error_t info_get(ws_rpl_info_t *info_ptr);

/**
* \brief Get Wi-SUN Radio Quality information.
* \brief Get Wi-SUN Stack information.
*
* Function reads Stack information from nanostack.
* Mesh interface must be initialized before calling this function.
*
* \param radio_info_ptr Structure given to stack where information will be stored
* \param stack_info_ptr Structure given to stack where information will be stored
*
* \return MESH_ERROR_NONE on success.
* \return MESH_ERROR_UNKNOWN in case of failure.
* */
mesh_error_t radio_info_get(ws_radio_info_t *radio_info_ptr);
mesh_error_t stack_info_get(ws_stack_state_t *stack_info_ptr);

protected:
Nanostack::WisunInterface *get_interface() const;
Expand Down
17 changes: 2 additions & 15 deletions connectivity/nanostack/mbed-mesh-api/source/WisunBorderRouter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ mesh_error_t WisunBorderRouter::start(NetworkInterface *mesh_if, NetworkInterfac
if (backbone_if_id < 0) {
return MESH_ERROR_UNKNOWN;
}
_backbone_if_id = backbone_if_id;

int ret = ws_bbr_start(mesh_if_id, backbone_if_id);
if (ret < 0) {
Expand Down Expand Up @@ -159,8 +158,6 @@ mesh_error_t WisunBorderRouter::validate_pan_configuration(uint16_t pan_id)
mesh_error_t WisunBorderRouter::info_get(ws_br_info_t *info_ptr)
{
bbr_information_t bbr_info = {0};
uint8_t mesh_link_local_addr[16] = {0};
uint8_t backbone_global_addr[16] = {0};

if (info_ptr == NULL) {
return MESH_ERROR_PARAM;
Expand All @@ -171,24 +168,14 @@ mesh_error_t WisunBorderRouter::info_get(ws_br_info_t *info_ptr)
return MESH_ERROR_UNKNOWN;
}

if (arm_net_address_get(_mesh_if_id, ADDR_IPV6_LL, mesh_link_local_addr) != 0) {
// No global prefix available, Nothing to do.
}

if (arm_net_address_get(_backbone_if_id, ADDR_IPV6_GP, backbone_global_addr) != 0) {
// No global prefix available, Nothing to do.
}

info_ptr->device_count = bbr_info.devices_in_network;
info_ptr->host_timestamp = bbr_info.timestamp;
info_ptr->instance_id = bbr_info.instance_id;
info_ptr->version = bbr_info.version;
memcpy(info_ptr->rpl_dodag_id, bbr_info.dodag_id, 16);
memcpy(info_ptr->global_addr, bbr_info.prefix, 8);
memcpy(info_ptr->global_addr + 8, bbr_info.IID, 8);
memcpy(info_ptr->ipv6_prefix, bbr_info.prefix, 8);
memcpy(info_ptr->ipv6_iid, bbr_info.IID, 8);
memcpy(info_ptr->gateway_addr, bbr_info.gateway, 16);
memcpy(info_ptr->link_local_addr, mesh_link_local_addr, 16);
memcpy(info_ptr->backbone_global_addr, backbone_global_addr, 16);

return MESH_ERROR_NONE;
}
Expand Down
41 changes: 19 additions & 22 deletions connectivity/nanostack/mbed-mesh-api/source/WisunInterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,6 @@ mesh_error_t WisunInterface::info_get(ws_rpl_info_t *info_ptr)
}

rpl_dodag_info_t dodag_ptr = {0};
ws_stack_info_t stack_info = {0};
uint8_t global_address[16] = {0};
uint8_t link_local_address[16] = {0};
uint8_t rpl_instance_count;
uint8_t instance_id_list[10];
uint8_t instance_id = RPL_INSTANCE_LOCAL;
Expand Down Expand Up @@ -589,44 +586,44 @@ mesh_error_t WisunInterface::info_get(ws_rpl_info_t *info_ptr)
return MESH_ERROR_UNKNOWN;
}

if (ws_stack_info_get(get_interface_id(), &stack_info)) {
return MESH_ERROR_UNKNOWN;
}

if (arm_net_address_get(get_interface_id(), ADDR_IPV6_GP, global_address) != 0) {
// No global prefix available, Nothing to do.
}

if (arm_net_address_get(get_interface_id(), ADDR_IPV6_LL, link_local_address) != 0) {
// No local prefix available, Nothing to do.
}

info_ptr->instance_id = dodag_ptr.instance_id;
info_ptr->version = dodag_ptr.version_num;
info_ptr->curent_rank = dodag_ptr.curent_rank;
info_ptr->primary_parent_rank = dodag_ptr.primary_parent_rank;
memcpy(info_ptr->rpl_dodag_id, dodag_ptr.dodag_id, 16);
memcpy(info_ptr->global_addr, global_address, 16);
memcpy(info_ptr->link_local_addr, link_local_address, 16);
memcpy(info_ptr->rpl_parent_addr, stack_info.parent, 16);

return MESH_ERROR_NONE;
}

mesh_error_t radio_info_get(ws_radio_info_t *radio_info_ptr)
mesh_error_t WisunInterface::stack_info_get(ws_stack_state_t *stack_info_ptr)
{
if (radio_info_ptr == NULL) {
if (stack_info_ptr == NULL) {
return MESH_ERROR_PARAM;
}

ws_stack_info_t stack_info = {0};
uint8_t global_address[16] = {0};
uint8_t link_local_address[16] = {0};

if (ws_stack_info_get(get_interface_id(), &stack_info)) {
return MESH_ERROR_UNKNOWN;
}

radio_info_ptr->rsl_in = stack_info.rsl_in;
radio_info_ptr->rsl_out = stack_info.rsl_out;
if (arm_net_address_get(get_interface_id(), ADDR_IPV6_GP, global_address) != 0) {
// No global prefix available, Nothing to do.
}

if (arm_net_address_get(get_interface_id(), ADDR_IPV6_LL, link_local_address) != 0) {
// No local prefix available, Nothing to do.
}

stack_info_ptr->join_state = stack_info.join_state;
stack_info_ptr->pan_id = stack_info.pan_id;
stack_info_ptr->rsl_in = stack_info.rsl_in;
stack_info_ptr->rsl_out = stack_info.rsl_out;
memcpy(stack_info_ptr->parent_addr, stack_info.parent, 16);
memcpy(stack_info_ptr->global_addr, global_address, 16);
memcpy(stack_info_ptr->link_local_addr, link_local_address, 16);

return MESH_ERROR_NONE;
}
Expand Down

0 comments on commit c017215

Please sign in to comment.