Changeset 753 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Oct 8, 2006 12:39:34 PM (18 years ago)

Author:

bennylp

Message:

Major addition to support DNS SRV resolution in PJSIP:

• added DNS asynchronous/caching resolver engine in PJLIB-UTIL (resolver.[hc])
• modified SIP resolver (sip_resolve.c) to properly perform DNS SRV/A resolution when DNS resolution is enabled.
• added dns_test.c in PJSIP-TEST for testing the SIP resolver.
• added nameserver configuration in PJSUA-LIB
• added "--nameserver" option in PJSUA.
• updated project/Makefiles and doxygen documentation.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -455 +455 @@
         status = pjsua_reconfigure_logging(log_cfg);
         PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+    }
+
+    /* If nameserver is configured, create DNS resolver instance and
+     * set it to be used by SIP resolver.
+     */
+    if (ua_cfg->nameserver_count) {
+#if PJSIP_HAS_RESOLVER
+        pj_dns_resolver *resv;
+        unsigned i;
+
+        /* Create DNS resolver */
+        status = pjsip_endpt_create_resolver(pjsua_var.endpt, &resv);
+        PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
+
+        /* Configure nameserver for the DNS resolver */
+        status = pj_dns_resolver_set_ns(resv, ua_cfg->nameserver_count,
+                                        ua_cfg->nameserver, NULL);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error setting nameserver", status);
+            return status;
+        }
+
+        /* Set this DNS resolver to be used by the SIP resolver */
+        status = pjsip_endpt_set_resolver(pjsua_var.endpt, resv);
+        if (status != PJ_SUCCESS) {
+            pjsua_perror(THIS_FILE, "Error setting DNS resolver", status);
+            return status;
+        }
+
+        /* Print nameservers */
+        for (i=0; i<ua_cfg->nameserver_count; ++i) {
+            PJ_LOG(4,(THIS_FILE, "Nameserver %.*s added",
+                      (int)ua_cfg->nameserver[i].slen,
+                      ua_cfg->nameserver[i].ptr));
+        }
+#else
+        PJ_LOG(2,(THIS_FILE, 
+                  "DNS resolver is disabled (PJSIP_HAS_RESOLVER==0)"));
+#endif
     }