Wed Feb 25 13:09:35 CST 2009 Pekka Pessi <first.last@nokia.com>

  * sres.c: improved error handling
  Ignore-this: a64e098f8575511bb6e5ef3129635d98

  Returning records with SRES_NETWORK_ERR or SRES_TIMEOUT_ERR.
  Also setting errno if there is no available DNS servers.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12284 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index ace50befaa42f434b3cef7a1a49acc40f9eb212d..636a83f2c6dffef8515b5b5dba3f84c2a3c982fb 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Wed Feb 25 13:36:25 CST 2009
+Wed Feb 25 13:37:49 CST 2009

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h b/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h
index 80a61bbc4a0802fcb77f96b0dc6d6bd7d486f16c..a92cbd49405d37b8bb702d91b71ab3e38caa48c8 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_record.h
@@ -73,6 +73,7 @@ enum sres_status {
   SRES_TIMEOUT_ERR = 32,       /**< Timeout occurred */
   SRES_RECORD_ERR = 33,                /**< Name has no given record type */
   SRES_INTERNAL_ERR = 34,      /**< Internal error */
+  SRES_NETWORK_ERR = 35,       /**< Network or DNS configuration error. */
 
   _SRES_LAST_ERR
 };

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
index 1439e7e4ed7eaad8f62bf3de7cd9409a38e2003d..46724869366df2ab4e523d518f74d0feb56da8ee 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
@@ -1554,6 +1554,7 @@ char const *sres_record_status(int status, char buffer[8])
   case SRES_TIMEOUT_ERR: return "TIMEOUT_ERR";
   case SRES_RECORD_ERR: return "RECORD_ERR";
   case SRES_INTERNAL_ERR: return "INTERNAL_ERR";
+  case SRES_NETWORK_ERR: return "NETWORK_ERR";
 
   default:
     if (buffer)
@@ -2749,6 +2750,8 @@ sres_send_dns_query(sres_resolver_t *res,
   if (i0 > N) i0 = 0; /* Number of DNS servers reduced */
   dns = servers[i = i0];
 
+  error = EIO;
+
   if (res->res_config->c_opt.rotate || dns->dns_error || dns->dns_icmp)
     dns = sres_next_server(res, &q->q_i_server, 1), i = q->q_i_server;
 
@@ -2938,10 +2941,21 @@ sres_query_report_error(sres_query_t *q,
       }
     }
 
-    for (i = 0; answers[i]; i++) {
-      status = answers[i]->sr_record->r_status;
-      if (status)
-       break;
+    if (answers == NULL) {
+      sres_cache_t *cache = q->q_res->res_cache;
+
+      status = q->q_retry_count ? SRES_TIMEOUT_ERR : SRES_NETWORK_ERR;
+
+      answers = su_zalloc(CHOME(cache), 2 * sizeof *answers);
+      if (answers)
+       answers[0] = sres_create_error_rr(cache, q, status);
+    }
+    else {
+      for (i = 0; answers[i]; i++) {
+       status = answers[i]->sr_record->r_status;
+       if (status)
+         break;
+      }
     }
 
     SU_DEBUG_5(("sres(q=%p): reporting error %s for %s %s\n",