defrag: update radix usage

Update defrag timeout lookup to use the updated radix API.

The return of user_data is treated as a succesful lookup, instead of
the node.
pull/835/head
Victor Julien 11 years ago
parent d0a26c6a17
commit cd91738a4b

@ -70,21 +70,22 @@ static void DefragPolicyAddHostInfo(char *host_ip_range, uint64_t timeout)
static int DefragPolicyGetIPv4HostTimeout(uint8_t *ipv4_addr) static int DefragPolicyGetIPv4HostTimeout(uint8_t *ipv4_addr)
{ {
SCRadixNode *node = SCRadixFindKeyIPV4BestMatch(ipv4_addr, defrag_tree); void *user_data = NULL;
(void)SCRadixFindKeyIPV4BestMatch(ipv4_addr, defrag_tree, &user_data);
if (node == NULL) if (user_data == NULL)
return -1; return -1;
else
return *((int *)node->prefix->user_data_result); return *((int *)user_data);
} }
static int DefragPolicyGetIPv6HostTimeout(uint8_t *ipv6_addr) static int DefragPolicyGetIPv6HostTimeout(uint8_t *ipv6_addr)
{ {
SCRadixNode *node = SCRadixFindKeyIPV6BestMatch(ipv6_addr, defrag_tree); void *user_data = NULL;
if (node == NULL) (void)SCRadixFindKeyIPV6BestMatch(ipv6_addr, defrag_tree, &user_data);
if (user_data == NULL)
return -1; return -1;
else
return *((int *)node->prefix->user_data_result); return *((int *)user_data);
} }
int DefragPolicyGetHostTimeout(Packet *p) int DefragPolicyGetHostTimeout(Packet *p)

Loading…
Cancel
Save