planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved discriptor sub-element handling and debugging.

Browse Source 
FossilOrigin-Name: 1be3acc6e8fe2f1b579bf1d84589aca685effc8c551372b536488f66ce0e0d84
This commit is contained in:
7u83@mail.ru
2016-03-14 23:31:31 +00:00
parent f8891001d6
commit f2d477ec97
14 changed files with 139 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cw/cw_read_wtp_descriptor.c
View File

@ -6,10 +6,9 @@
int cw_read_wtp_descriptor(mbag_t mbag, struct conn *conn,
struct cw_action_in *a, uint8_t * data, int len)
struct cw_action_in *a, uint8_t * data, int len,struct cw_descriptor_subelem_def *allowed)
{
mbag_set_byte(mbag, CW_ITEM_WTP_MAX_RADIOS, cw_get_byte(data));
mbag_set_byte(mbag, CW_ITEM_WTP_RADIOS_IN_USE, cw_get_byte(data + 1));
@ -33,6 +32,17 @@ int cw_read_wtp_descriptor(mbag_t mbag, struct conn *conn,
pos += 3;
}
return cw_read_wtp_descriptor_versions(mbag, data + pos, len - pos);
static struct cw_descriptor_subelem_def allowed_default[] = {
{0,CW_SUBELEM_WTP_HARDWARE_VERSION, CW_ITEM_WTP_HARDWARE_VERSION, 1024,1},
{0,CW_SUBELEM_WTP_SOFTWARE_VERSION, CW_ITEM_WTP_SOFTWARE_VERSION, 1024,1},
{0,CW_SUBELEM_WTP_BOOTLOADER_VERSION, CW_ITEM_WTP_SOFTWARE_VERSION, 1024,1},
{0,CW_SUBELEM_WTP_OTHERSOFTWARE_VERSION, CW_ITEM_WTP_SOFTWARE_VERSION, 1024,0},
{0,0, NULL, 0,0}
};
if (!allowed) {
allowed=allowed_default;
}
return cw_read_descriptor_subelems(conn->incomming, data + pos, len - pos, allowed);
}