Improved handling of message elements parsed. Reduces the memory occupied but
it introduces a small overhead in retrieving of message elements parsed.
This commit is contained in:
@ -20,36 +20,12 @@ static void capwap_resultcode_element_create(void* data, capwap_message_elements
|
||||
struct capwap_resultcode_element* element = (struct capwap_resultcode_element*)data;
|
||||
|
||||
ASSERT(data != NULL);
|
||||
ASSERT((element->code >= CAPWAP_RESULTCODE_FIRST) && (element->code <= CAPWAP_RESULTCODE_LAST));
|
||||
|
||||
/* */
|
||||
func->write_u32(handle, element->code);
|
||||
}
|
||||
|
||||
/* */
|
||||
static void* capwap_resultcode_element_parsing(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func) {
|
||||
struct capwap_resultcode_element* data;
|
||||
|
||||
ASSERT(handle != NULL);
|
||||
ASSERT(func != NULL);
|
||||
|
||||
if (func->read_ready(handle) != 4) {
|
||||
capwap_logging_debug("Invalid Result Code element");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* */
|
||||
data = (struct capwap_resultcode_element*)capwap_alloc(sizeof(struct capwap_resultcode_element));
|
||||
if (!data) {
|
||||
capwap_outofmemory();
|
||||
}
|
||||
|
||||
/* Retrieve data */
|
||||
memset(data, 0, sizeof(struct capwap_resultcode_element));
|
||||
func->read_u32(handle, &data->code);
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
/* */
|
||||
static void capwap_resultcode_element_free(void* data) {
|
||||
ASSERT(data != NULL);
|
||||
@ -57,6 +33,35 @@ static void capwap_resultcode_element_free(void* data) {
|
||||
capwap_free(data);
|
||||
}
|
||||
|
||||
/* */
|
||||
static void* capwap_resultcode_element_parsing(capwap_message_elements_handle handle, struct capwap_read_message_elements_ops* func) {
|
||||
struct capwap_resultcode_element* data;
|
||||
|
||||
ASSERT(handle != NULL);
|
||||
ASSERT(func != NULL);
|
||||
|
||||
if (func->read_ready(handle) != 4) {
|
||||
capwap_logging_debug("Invalid Result Code element: underbuffer");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* */
|
||||
data = (struct capwap_resultcode_element*)capwap_alloc(sizeof(struct capwap_resultcode_element));
|
||||
if (!data) {
|
||||
capwap_outofmemory();
|
||||
}
|
||||
|
||||
/* Retrieve data */
|
||||
func->read_u32(handle, &data->code);
|
||||
if ((data->code < CAPWAP_RESULTCODE_FIRST) || (data->code > CAPWAP_RESULTCODE_LAST)) {
|
||||
capwap_resultcode_element_free((void*)data);
|
||||
capwap_logging_debug("Invalid Result Code element: invalid code");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
/* */
|
||||
struct capwap_message_elements_ops capwap_element_resultcode_ops = {
|
||||
.create_message_element = capwap_resultcode_element_create,
|
||||
|
Reference in New Issue
Block a user