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

simplify element list handling

Browse Source 
Doing all the work to create a list element only to fail when we can
not decode the element is a waste of effort.
Decode the element first and only on success handle the list operations.
This commit is contained in:
Andreas Schultz 2016-03-07 18:19:07 +01:00
parent 38f7681608
commit 140be9b143
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/capwap_element.c
View File

@ -165,6 +165,7 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
uint16_t msglength; uint16_t msglength;
struct capwap_list_item* itemlist; struct capwap_list_item* itemlist;
struct capwap_message_element_itemlist* messageelement; struct capwap_message_element_itemlist* messageelement;
void *element;
const struct capwap_message_elements_ops* read_ops; const struct capwap_message_elements_ops* read_ops;
/* Get type and length */ /* Get type and length */
@ -203,6 +204,11 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
/* Allowed to parsing only the size of message element */ /* Allowed to parsing only the size of message element */
rxmngpacket->readerpacketallowed = msglength; rxmngpacket->readerpacketallowed = msglength;
/* Get message element */
element = read_ops->parse((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
if (!element)
return INVALID_MESSAGE_ELEMENT;
/* */ /* */
itemlist = capwap_get_message_element(packet, type); itemlist = capwap_get_message_element(packet, type);
if (read_ops->category == CAPWAP_MESSAGE_ELEMENT_SINGLE) { if (read_ops->category == CAPWAP_MESSAGE_ELEMENT_SINGLE) {
@ -216,16 +222,12 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
messageelement = (struct capwap_message_element_itemlist*)itemlist->item; messageelement = (struct capwap_message_element_itemlist*)itemlist->item;
messageelement->type = type; messageelement->type = type;
messageelement->category = CAPWAP_MESSAGE_ELEMENT_SINGLE; messageelement->category = CAPWAP_MESSAGE_ELEMENT_SINGLE;
messageelement->data = read_ops->parse((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops); messageelement->data = element;
if (!messageelement->data) {
capwap_itemlist_free(itemlist);
return INVALID_MESSAGE_ELEMENT;
}
/* */ /* */
capwap_itemlist_insert_after(packet->messages, NULL, itemlist); capwap_itemlist_insert_after(packet->messages, NULL, itemlist);
} else if (read_ops->category == CAPWAP_MESSAGE_ELEMENT_ARRAY) { }
void* datamsgelement; else if (read_ops->category == CAPWAP_MESSAGE_ELEMENT_ARRAY) {
struct capwap_array* arraymessageelement; struct capwap_array* arraymessageelement;
if (itemlist) { if (itemlist) {
@ -245,14 +247,8 @@ int capwap_parsing_packet(struct capwap_packet_rxmng* rxmngpacket, struct capwap
capwap_itemlist_insert_after(packet->messages, NULL, itemlist); capwap_itemlist_insert_after(packet->messages, NULL, itemlist);
} }
/* Get message element */
datamsgelement = read_ops->parse((capwap_message_elements_handle)rxmngpacket, &rxmngpacket->read_ops);
if (!datamsgelement) {
return INVALID_MESSAGE_ELEMENT;
}
/* */ /* */
memcpy(capwap_array_get_item_pointer(arraymessageelement, arraymessageelement->count), &datamsgelement, sizeof(void*)); *(void **)capwap_array_get_item_pointer(arraymessageelement, arraymessageelement->count) = element;
} }
/* Check if read all data of message element */ /* Check if read all data of message element */