Parcourir la source

core: print rdata pointer and wrap null condition around it in dbg message

(cherry picked from commit fcc6dbd6d9b50bdbee7ba22c22f8f06a98bfb2ca)
(cherry picked from commit c7ce1e3563f3eebe6960d619264e23982135e13b)
Daniel-Constantin Mierla il y a 11 ans
Parent
commit
952ad17333
1 fichiers modifiés avec 5 ajouts et 3 suppressions
  1. 5 3
      dns_cache.c

+ 5 - 3
dns_cache.c

@@ -2371,10 +2371,12 @@ retry:
 found:
 #ifdef DNS_CACHE_DEBUG
 	DBG("dns_srv_get_nxt_rr(%p, %lx, %d, %u): selected %d/%d in grp. %d"
-			" (rand_w=%d, rr=%p p=%d w=%d rsum=%d)\n",
+			" (rand_w=%d, rr=%p rd=%p p=%d w=%d rsum=%d)\n",
 		e, (unsigned long)*tried, *no, now, i, idx, n, rand_w, r_sums[i].rr,
-		((struct srv_rdata*)r_sums[i].rr->rdata)->priority,
-		((struct srv_rdata*)r_sums[i].rr->rdata)->weight, r_sums[i].r_sum);
+		r_sums[i].rr->rdata,
+		(r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->priority:0,
+		(r_sums[i].rr->rdata)?((struct srv_rdata*)r_sums[i].rr->rdata)->weight:0,
+		r_sums[i].r_sum);
 #endif
 	/* i is the winner */
 	*no=n; /* grp. start */