mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: resolvers: Use milliseconds for cached items in resolver responses

Browse Source 
The last time when an item was seen in a resolver responses is now stored in
milliseconds instead of seconds. This avoid some corner-cases at the
edges. This also simplifies time comparisons.
This commit is contained in:
Christopher Faulet 2021-03-11 09:36:05 +01:00
parent d83a6df5cd
commit 55c1c4053f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/haproxy/resolvers-t.h
View File

@ -113,7 +113,7 @@ struct resolv_answer_item {
uint16_t data_len; /* number of bytes in target below */ uint16_t data_len; /* number of bytes in target below */
struct sockaddr address; /* IPv4 or IPv6, network format */ struct sockaddr address; /* IPv4 or IPv6, network format */
char target[DNS_MAX_NAME_SIZE+1]; /* Response data: SRV or CNAME type target */ char target[DNS_MAX_NAME_SIZE+1]; /* Response data: SRV or CNAME type target */
time_t last_seen; /* When was the answer was last seen */ unsigned int last_seen; /* When was the answer was last seen */
struct resolv_answer_item *ar_item; /* pointer to a RRset from the additional section, if exists */ struct resolv_answer_item *ar_item; /* pointer to a RRset from the additional section, if exists */
struct list list; struct list list;
}; };

14
src/resolvers.c
View File

@ -582,7 +582,7 @@ static void resolv_check_response(struct resolv_resolution *res)
struct resolv_answer_item *ar_item = item->ar_item; struct resolv_answer_item *ar_item = item->ar_item;
/* clean up obsolete Additional record */ /* clean up obsolete Additional record */
if (ar_item && (ar_item->last_seen + resolvers->hold.obsolete / 1000) < now.tv_sec) { if (ar_item && tick_is_lt(tick_add(ar_item->last_seen, resolvers->hold.obsolete), now_ms)) {
/* Cleaning up the AR item will trigger an extra DNS resolution, except if the SRV /* Cleaning up the AR item will trigger an extra DNS resolution, except if the SRV
* item is also obsolete. * item is also obsolete.
*/ */
@ -591,7 +591,7 @@ static void resolv_check_response(struct resolv_resolution *res)
} }
/* Remove obsolete items */ /* Remove obsolete items */
if ((item->last_seen + resolvers->hold.obsolete / 1000) < now.tv_sec) { if (tick_is_lt(tick_add(item->last_seen, resolvers->hold.obsolete), now_ms)) {
if (item->type != DNS_RTYPE_SRV) if (item->type != DNS_RTYPE_SRV)
goto rm_obselete_item; goto rm_obselete_item;
@ -901,6 +901,7 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
/* initialization */ /* initialization */
answer_record->ar_item = NULL; answer_record->ar_item = NULL;
answer_record->last_seen = TICK_ETERNITY;
offset = 0; offset = 0;
len = resolv_read_name(resp, bufend, reader, tmpname, DNS_MAX_NAME_SIZE, &offset, 0); len = resolv_read_name(resp, bufend, reader, tmpname, DNS_MAX_NAME_SIZE, &offset, 0);
@ -1096,12 +1097,12 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
} }
if (found == 1) { if (found == 1) {
tmp_record->last_seen = now.tv_sec; tmp_record->last_seen = now_ms;
pool_free(resolv_answer_item_pool, answer_record); pool_free(resolv_answer_item_pool, answer_record);
answer_record = NULL; answer_record = NULL;
} }
else { else {
answer_record->last_seen = now.tv_sec; answer_record->last_seen = now_ms;
answer_record->ar_item = NULL; answer_record->ar_item = NULL;
LIST_ADDQ(&r_res->answer_list, &answer_record->list); LIST_ADDQ(&r_res->answer_list, &answer_record->list);
answer_record = NULL; answer_record = NULL;
@ -1151,6 +1152,7 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
answer_record = pool_alloc(resolv_answer_item_pool); answer_record = pool_alloc(resolv_answer_item_pool);
if (answer_record == NULL) if (answer_record == NULL)
goto invalid_resp; goto invalid_resp;
answer_record->last_seen = TICK_ETERNITY;
offset = 0; offset = 0;
len = resolv_read_name(resp, bufend, reader, tmpname, DNS_MAX_NAME_SIZE, &offset, 0); len = resolv_read_name(resp, bufend, reader, tmpname, DNS_MAX_NAME_SIZE, &offset, 0);
@ -1277,12 +1279,12 @@ static int resolv_validate_dns_response(unsigned char *resp, unsigned char *bufe
} }
if (found == 1) { if (found == 1) {
tmp_record->ar_item->last_seen = now.tv_sec; tmp_record->ar_item->last_seen = now_ms;
pool_free(resolv_answer_item_pool, answer_record); pool_free(resolv_answer_item_pool, answer_record);
answer_record = NULL; answer_record = NULL;
} }
else { else {
answer_record->last_seen = now.tv_sec; answer_record->last_seen = now_ms;
answer_record->ar_item = NULL; answer_record->ar_item = NULL;
// looking for the SRV record in the response list linked to this additional record // looking for the SRV record in the response list linked to this additional record