Changeset 1348

Timestamp:

Jun 7, 2007 3:47:31 PM (17 years ago)

Author:

bennylp

Message:

Another ticket #325: More tunable settings in DNS resolver

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c (modified) (7 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/resolver.c

@@ -63 +63 @@
 };
 
+static const char *state_names[3] =
+{
+    "Probing",
+    "Active",
+    "Bad"
+};
+
+
 /* 
  * Each nameserver entry.
@@ -217 +225 @@
 
 
+/* Initialize DNS settings with default values */
+PJ_DEF(void) pj_dns_settings_default(pj_dns_settings *s)
+{
+    pj_bzero(s, sizeof(pj_dns_settings));
+    s->qretr_delay = PJ_DNS_RESOLVER_QUERY_RETRANSMIT_DELAY;
+    s->qretr_count = PJ_DNS_RESOLVER_QUERY_RETRANSMIT_COUNT;
+    s->cache_max_ttl = PJ_DNS_RESOLVER_MAX_TTL;
+    s->good_ns_ttl = PJ_DNS_RESOLVER_GOOD_NS_TTL;
+    s->bad_ns_ttl = PJ_DNS_RESOLVER_BAD_NS_TTL;
+}
+
+
 /*
  * Create the resolver.
@@ -258 +278 @@
     resv->ioqueue = ioqueue;
     resv->last_id = 1;
+
+    pj_dns_settings_default(&resv->settings);
     resv->settings.options = options;
-    resv->settings.qretr_delay = PJ_DNS_RESOLVER_QUERY_RETRANSMIT_DELAY;
-    resv->settings.qretr_count = PJ_DNS_RESOLVER_QUERY_RETRANSMIT_COUNT;
-    resv->settings.cache_max_ttl = PJ_DNS_RESOLVER_MAX_TTL;
 
     /* Create the timer heap if one is not specified */
@@ -791 +810 @@
 {
     struct nameserver *ns = &resolver->ns[index];
+    enum ns_state old_state = ns->state;
 
     ns->state = state;
@@ -796 +816 @@
 
     if (state == STATE_PROBING)
-        ns->state_expiry.sec += ((PJ_DNS_RESOLVER_QUERY_RETRANSMIT_COUNT + 2) *
-                                 PJ_DNS_RESOLVER_QUERY_RETRANSMIT_DELAY) / 1000;
+        ns->state_expiry.sec += ((resolver->settings.qretr_count + 2) *
+                                 resolver->settings.qretr_delay) / 1000;
     else if (state == STATE_ACTIVE)
-        ns->state_expiry.sec += PJ_DNS_RESOLVER_GOOD_NS_TTL;
+        ns->state_expiry.sec += resolver->settings.good_ns_ttl;
     else
-        ns->state_expiry.sec += PJ_DNS_RESOLVER_BAD_NS_TTL;
-
+        ns->state_expiry.sec += resolver->settings.bad_ns_ttl;
+
+    PJ_LOG(5, (resolver->name.ptr, "Nameserver %s:%d state changed %s --> %s",
+               pj_inet_ntoa(ns->addr.sin_addr),
+               (int)pj_ntohs(ns->addr.sin_port),
+               state_names[old_state], state_names[state]));
 }
 
@@ -1071 +1095 @@
 
     /* Check to see if we should retransmit instead of time out */
-    if (q->transmit_cnt < PJ_DNS_RESOLVER_QUERY_RETRANSMIT_COUNT) {
+    if (q->transmit_cnt < resolver->settings.qretr_count) {
         status = transmit_query(resolver, q);
         if (status == PJ_SUCCESS) {
@@ -1204 +1228 @@
     if (!q) {
         PJ_LOG(5,(resolver->name.ptr, 
-                  "Unable to find query for DNS response id=%d from %s:%d "
-                  "(the query may had been answered by other name servers)",
-                  (unsigned)dns_pkt->hdr.id,
+                  "DNS response from %s:%d id=%d discarded",
                   pj_inet_ntoa(resolver->udp_src_addr.sin_addr), 
-                  pj_ntohs(resolver->udp_src_addr.sin_port)));
+                  pj_ntohs(resolver->udp_src_addr.sin_port),
+                  (unsigned)dns_pkt->hdr.id));
         goto read_next_packet;
     }