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

Remove assertion and permit to call timeout functions with unset index timeout

Browse Source
This commit is contained in:
vemax78 2014-03-16 22:10:28 +01:00
parent 684a829158
commit 3dff1dc28b
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/capwap_timeout.c
View File

@ -129,15 +129,16 @@ unsigned long capwap_timeout_createtimer(struct capwap_timeout* timeout) {
/* */ /* */
void capwap_timeout_deletetimer(struct capwap_timeout* timeout, unsigned long index) { void capwap_timeout_deletetimer(struct capwap_timeout* timeout, unsigned long index) {
ASSERT(timeout != NULL); ASSERT(timeout != NULL);
ASSERT(index != CAPWAP_TIMEOUT_INDEX_NO_SET);
capwap_logging_debug("Delete timer: %lu", index); if (index != CAPWAP_TIMEOUT_INDEX_NO_SET) {
capwap_logging_debug("Delete timer: %lu", index);
/* Unset timeout timer */ /* Unset timeout timer */
capwap_timeout_unset(timeout, index); capwap_timeout_unset(timeout, index);
/* Release timer index */ /* Release timer index */
capwap_timeout_clear_bitfield(timeout, index); capwap_timeout_clear_bitfield(timeout, index);
}
} }
/* */ /* */
@ -204,14 +205,14 @@ void capwap_timeout_unset(struct capwap_timeout* timeout, unsigned long index) {
struct capwap_list_item* itemlist; struct capwap_list_item* itemlist;
ASSERT(timeout != NULL); ASSERT(timeout != NULL);
ASSERT(index != CAPWAP_TIMEOUT_INDEX_NO_SET);
/* */ if (index != CAPWAP_TIMEOUT_INDEX_NO_SET) {
itemlist = (struct capwap_list_item*)capwap_hash_search(timeout->itemsreference, &index); itemlist = (struct capwap_list_item*)capwap_hash_search(timeout->itemsreference, &index);
if (itemlist) { if (itemlist) {
capwap_logging_debug("Unset timeout: %lu", index); capwap_logging_debug("Unset timeout: %lu", index);
capwap_hash_delete(timeout->itemsreference, &index); capwap_hash_delete(timeout->itemsreference, &index);
capwap_itemlist_free(capwap_itemlist_remove(timeout->itemstimeout, itemlist)); capwap_itemlist_free(capwap_itemlist_remove(timeout->itemstimeout, itemlist));
}
} }
} }