Improve memory administration for tx/rx packet manager
This commit is contained in:
@ -12,82 +12,65 @@
|
||||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
||||
|
||||
Type: 25 for Image Identifier
|
||||
|
||||
Length: >= 5
|
||||
|
||||
********************************************************************/
|
||||
|
||||
struct capwap_imageidentifier_raw_element {
|
||||
unsigned long vendor;
|
||||
char name[0];
|
||||
} __attribute__((__packed__));
|
||||
/* */
|
||||
static void capwap_imageidentifier_element_create(void* data, capwap_message_elements_handle handle, struct capwap_write_message_elements_ops* func) {
|
||||
struct capwap_imageidentifier_element* element = (struct capwap_imageidentifier_element*)data;
|
||||
|
||||
ASSERT(data != NULL);
|
||||
|
||||
func->write_u32(handle, element->vendor);
|
||||
func->write_block(handle, element->name, strlen((char*)element->name));
|
||||
}
|
||||
|
||||
/* */
|
||||
struct capwap_message_element* capwap_imageidentifier_element_create(void* data, unsigned long datalength) {
|
||||
unsigned short namelength;
|
||||
struct capwap_message_element* element;
|
||||
struct capwap_imageidentifier_raw_element* dataraw;
|
||||
struct capwap_imageidentifier_element* dataelement = (struct capwap_imageidentifier_element*)data;
|
||||
|
||||
ASSERT(data != NULL);
|
||||
ASSERT(datalength == sizeof(struct capwap_imageidentifier_element));
|
||||
|
||||
/* Alloc block of memory */
|
||||
namelength = strlen(dataelement->name);
|
||||
element = capwap_alloc(sizeof(struct capwap_message_element) + sizeof(struct capwap_imageidentifier_raw_element) + namelength);
|
||||
if (!element) {
|
||||
capwap_outofmemory();
|
||||
static void* capwap_imageidentifier_element_parsing(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func) {
|
||||
unsigned short length;
|
||||
struct capwap_imageidentifier_element* data;
|
||||
|
||||
ASSERT(handle != NULL);
|
||||
ASSERT(func != NULL);
|
||||
|
||||
length = func->read_ready(handle);
|
||||
if (length < 5) {
|
||||
capwap_logging_debug("Invalid Image Indentifier element");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Create message element */
|
||||
memset(element, 0, sizeof(struct capwap_message_element) + sizeof(struct capwap_imageidentifier_raw_element) + namelength);
|
||||
element->type = htons(CAPWAP_ELEMENT_IMAGEIDENTIFIER);
|
||||
element->length = htons(sizeof(struct capwap_imageidentifier_raw_element) + namelength);
|
||||
|
||||
dataraw = (struct capwap_imageidentifier_raw_element*)element->data;
|
||||
dataraw->vendor = htonl(dataelement->vendor);
|
||||
memcpy(&dataraw->name[0], &dataelement->name[0], namelength);
|
||||
|
||||
return element;
|
||||
}
|
||||
|
||||
/* */
|
||||
int capwap_imageidentifier_element_validate(struct capwap_message_element* element) {
|
||||
/* TODO */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* */
|
||||
void* capwap_imageidentifier_element_parsing(struct capwap_message_element* element) {
|
||||
unsigned short namelength;
|
||||
struct capwap_imageidentifier_element* data;
|
||||
struct capwap_imageidentifier_raw_element* dataraw;
|
||||
|
||||
ASSERT(element);
|
||||
ASSERT(ntohs(element->type) == CAPWAP_ELEMENT_IMAGEIDENTIFIER);
|
||||
|
||||
namelength = ntohs(element->length) - sizeof(struct capwap_imageidentifier_raw_element);
|
||||
if (!namelength || (namelength > CAPWAP_IMAGEIDENTIFIER_MAXLENGTH)) {
|
||||
length -= 4;
|
||||
if (length > CAPWAP_IMAGEIDENTIFIER_MAXLENGTH) {
|
||||
capwap_logging_debug("Invalid AC Name element");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* */
|
||||
dataraw = (struct capwap_imageidentifier_raw_element*)element->data;
|
||||
data = (struct capwap_imageidentifier_element*)capwap_alloc(sizeof(struct capwap_imageidentifier_element));
|
||||
if (!data) {
|
||||
capwap_outofmemory();
|
||||
}
|
||||
|
||||
/* */
|
||||
data->vendor = ntohl(dataraw->vendor);
|
||||
memcpy(&data->name[0], &dataraw->name[0], namelength);
|
||||
data->name[namelength] = 0;
|
||||
|
||||
/* Retrieve data */
|
||||
memset(data, 0, sizeof(struct capwap_imageidentifier_element));
|
||||
func->read_u32(handle, &data->vendor);
|
||||
func->read_block(handle, data->name, length);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
/* */
|
||||
void capwap_imageidentifier_element_free(void* data) {
|
||||
static void capwap_imageidentifier_element_free(void* data) {
|
||||
ASSERT(data != NULL);
|
||||
|
||||
capwap_free(data);
|
||||
}
|
||||
|
||||
/* */
|
||||
struct capwap_message_elements_ops capwap_element_imageidentifier_ops = {
|
||||
.create_message_element = capwap_imageidentifier_element_create,
|
||||
.parsing_message_element = capwap_imageidentifier_element_parsing,
|
||||
.free_parsed_message_element = capwap_imageidentifier_element_free
|
||||
};
|
||||
|
Reference in New Issue
Block a user