From 8d48aa190b2196efc50e169232494413bc36109a Mon Sep 17 00:00:00 2001 From: Elizabeth Myers Date: Sat, 2 Apr 2016 20:19:37 -0500 Subject: [PATCH] dns: don't use zero ID's --- ircd/dns.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ircd/dns.c b/ircd/dns.c index a3a8077e..4af77f48 100644 --- a/ircd/dns.c +++ b/ircd/dns.c @@ -66,8 +66,15 @@ rb_dlink_list nameservers; static uint32_t query_id = 0; static uint32_t stat_id = 0; -#define ASSIGN_ID(id) (id++) +static inline uint32_t +assign_id(uint32_t *id) +{ + if(++(*id) == 0) + *id = 1; + + return *id; +} static void handle_dns_failure(uint32_t xid) @@ -122,7 +129,7 @@ lookup_hostname(const char *hostname, int aftype, DNSCB callback, void *data) { struct dnsreq *req = rb_malloc(sizeof(struct dnsreq)); int aft; - uint32_t rid = ASSIGN_ID(query_id); + uint32_t rid = assign_id(&query_id); check_authd(); @@ -147,7 +154,7 @@ lookup_ip(const char *addr, int aftype, DNSCB callback, void *data) { struct dnsreq *req = rb_malloc(sizeof(struct dnsreq)); int aft; - uint32_t rid = ASSIGN_ID(query_id); + uint32_t rid = assign_id(&query_id); check_authd(); @@ -171,7 +178,7 @@ uint32_t get_nameservers(DNSLISTCB callback, void *data) { struct dnsstatreq *req = rb_malloc(sizeof(struct dnsstatreq)); - uint32_t qid = ASSIGN_ID(stat_id); + uint32_t qid = assign_id(&stat_id); check_authd();