more progress in new ktv storage
FossilOrigin-Name: a2c26a366de1946feb707439302b22de2e3d02f7621d0834fdf242852b28639c
This commit is contained in:
		@ -8,10 +8,10 @@
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
static struct cw_DescriptorSubelemDef allowed_default[] = {
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_HARDWARE_VERSION, CW_KEY_HARDWARE, 1024,0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_SOFTWARE_VERSION, CW_KEY_SOFTWARE, 1024.0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_BOOTLOADER_VERSION, CW_KEY_BOOTLOADER, 1024,0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_OTHERSOFTWARE_VERSION, CW_KEY_OTHER_SOFTWARE, 1024,0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_HARDWARE_VERSION, CW_SKEY_HARDWARE, 1024,0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_SOFTWARE_VERSION, CW_SKEY_SOFTWARE, 1024.0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_BOOTLOADER_VERSION, CW_SKEY_BOOTLOADER, 1024,0},
 | 
			
		||||
	{-1,CW_SUBELEM_WTP_OTHERSOFTWARE_VERSION, CW_SKEY_OTHER_SOFTWARE, 1024,0},
 | 
			
		||||
	{0,0, NULL, 0,0}
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
@ -28,22 +28,12 @@ int cw_read_wtp_descriptor_7(mavl_t cfg, struct conn *conn,
 | 
			
		||||
	int ncrypt, pos;
 | 
			
		||||
	char key[64];
 | 
			
		||||
 | 
			
		||||
	sprintf(key,"%s/%s",eh->key, "max_radios");
 | 
			
		||||
/*	md.kv.key=strdup(key);
 | 
			
		||||
	mavl_replace (cfg, cw_type_byte.get(&md,data,1));
 | 
			
		||||
*/
 | 
			
		||||
	sprintf(key,"%s/%s",eh->key, CW_SKEY_MAX_RADIOS);
 | 
			
		||||
	cw_ktv_add(cfg,key,CW_TYPE_BYTE,data,1);
 | 
			
		||||
 | 
			
		||||
	sprintf(key,"%s/%s",eh->key, "radios_in_use");
 | 
			
		||||
	sprintf(key,"%s/%s",eh->key, CW_SKEY_RADIOS_IN_USE);
 | 
			
		||||
	cw_ktv_add(cfg,key,CW_TYPE_BYTE,data+1,1);
 | 
			
		||||
	
 | 
			
		||||
/*	md.kv.key=strdup(key);
 | 
			
		||||
	mavl_replace (cfg, cw_type_byte.get(&md,data+1,1));
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
/*	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));
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
	pos = 2;
 | 
			
		||||
 | 
			
		||||
@ -52,7 +42,6 @@ int cw_read_wtp_descriptor_7(mavl_t cfg, struct conn *conn,
 | 
			
		||||
	pos += 2;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	if (!allowed)
 | 
			
		||||
		allowed=allowed_default;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user