7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved handling of message elements parsed. Reduces the memory occupied but

Browse Source 
it introduces a small overhead in retrieving of message elements parsed.
This commit is contained in:
vemax78
2013-06-09 17:41:52 +02:00
parent d9e02ded5a
commit 794a8e72d2
88 changed files with 1323 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/capwap_element_deletemacacl.c
View File

@ -20,6 +20,8 @@ static void capwap_deletemacacl_element_create(void* data, capwap_message_elemen
struct capwap_deletemacacl_element* element = (struct capwap_deletemacacl_element*)data;
ASSERT(data != NULL);
ASSERT(element->entry > 0);
ASSERT(IS_VALID_MACADDRESS_LENGTH(element->length));
func->write_u8(handle, element->entry);
func->write_u8(handle, element->length);
@ -36,7 +38,7 @@ static void capwap_deletemacacl_element_free(void* data) {
capwap_free(element->address);
}
capwap_free(element);
capwap_free(data);
}
/* */
@ -49,15 +51,11 @@ static void* capwap_deletemacacl_element_parsing(capwap_message_elements_handle
length = func->read_ready(handle);
if (length < 8) {
capwap_logging_debug("Invalid Delete MAC ACL Entry element");
capwap_logging_debug("Invalid Delete MAC ACL Entry element: underbuffer");
return NULL;
}
length -= 2;
if ((length % 6) && (length % 8)) {
capwap_logging_debug("Invalid Delete MAC ACL Entry element");
return NULL;
}
/* */
data = (struct capwap_deletemacacl_element*)capwap_alloc(sizeof(struct capwap_deletemacacl_element));
@ -67,10 +65,19 @@ static void* capwap_deletemacacl_element_parsing(capwap_message_elements_handle
/* Retrieve data */
memset(data, 0, sizeof(struct capwap_deletemacacl_element));
func->read_u8(handle, &data->entry);
func->read_u8(handle, &data->length);
if (!data->entry) {
capwap_deletemacacl_element_free((void*)data);
capwap_logging_debug("Invalid Delete MAC ACL Entry element: invalid entry");
return NULL;
} else if (!IS_VALID_MACADDRESS_LENGTH(data->length)) {
capwap_deletemacacl_element_free((void*)data);
capwap_logging_debug("Invalid Delete MAC ACL Entry element: invalid length");
return NULL;
}
if (length != (data->entry * data->length)) {
capwap_deletemacacl_element_free((void*)data);
capwap_logging_debug("Invalid Delete MAC ACL Entry element");