Changeset 753 for pjproject/trunk/pjsip/src/pjsip/sip_endpoint.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/pjsip/sip_endpoint.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -485 +485 @@
 
     /* Create asynchronous DNS resolver. */
-    endpt->resolver = pjsip_resolver_create(endpt->pool);
-    if (!endpt->resolver) {
+    status = pjsip_resolver_create(endpt->pool, &endpt->resolver);
+    if (status != PJ_SUCCESS) {
         PJ_LOG(4, (THIS_FILE, "Error creating resolver instance"));
         goto on_error;
@@ -927 +927 @@
 
 /*
+ * Create the DNS resolver instance. 
+ */
+PJ_DEF(pj_status_t) pjsip_endpt_create_resolver(pjsip_endpoint *endpt,
+                                                pj_dns_resolver **p_resv)
+{
+#if PJSIP_HAS_RESOLVER
+    PJ_ASSERT_RETURN(endpt && p_resv, PJ_EINVAL);
+    return pj_dns_resolver_create( endpt->pf, NULL, 0, endpt->timer_heap,
+                                   endpt->ioqueue, p_resv);
+#else
+    PJ_UNUSED_ARG(endpt);
+    PJ_UNUSED_ARG(p_resv);
+    pj_assert(!"Resolver is disabled (PJSIP_HAS_RESOLVER==0)");
+    return PJ_EINVALIDOP;
+#endif
+}
+
+/*
+ * Set DNS resolver to be used by the SIP resolver.
+ */
+PJ_DEF(pj_status_t) pjsip_endpt_set_resolver( pjsip_endpoint *endpt,
+                                              pj_dns_resolver *resv)
+{
+    return pjsip_resolver_set_resolver(endpt->resolver, resv);
+}
+
+/*
+ * Get the DNS resolver being used by the SIP resolver.
+ */
+PJ_DEF(pj_dns_resolver*) pjsip_endpt_get_resolver(pjsip_endpoint *endpt)
+{
+    PJ_ASSERT_RETURN(endpt, NULL);
+    return pjsip_resolver_get_resolver(endpt->resolver);
+}
+
+/*
  * Resolve
  */
@@ -1037 +1073 @@
                pj_pool_get_used_size(endpt->pool)));
 
+    /* Resolver */
+#if PJSIP_HAS_RESOLVER
+    if (pjsip_endpt_get_resolver(endpt)) {
+        pj_dns_resolver_dump(pjsip_endpt_get_resolver(endpt), detail);
+    }
+#endif
+
     /* Transports. 
      */