Merge branch 'nurupo-assoc-fix'

This commit is contained in:
irungentoo 2014-05-22 09:16:40 -04:00
commit 3ed7a3257f
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -428,8 +428,7 @@ static uint8_t candidates_create_internal(Assoc *assoc, hash_t hash, uint8_t *id
// enumerated lists are superior to magic numbers
if (!is_timeout(entry->used_at, BAD_NODE_TIMEOUT))
check = USED;
if (!is_timeout(entry->seen_at, CANDIDATES_SEEN_TIMEOUT))
else if (!is_timeout(entry->seen_at, CANDIDATES_SEEN_TIMEOUT))
check = SEENG;
else if (!is_timeout(entry->heard_at, CANDIDATES_HEARD_TIMEOUT))
check = SEENB_HEARDG;