Changeset 1642 for pjproject/trunk

Timestamp:

Dec 28, 2007 7:00:33 PM (16 years ago)

Author:

bennylp

Message:

Ticket #436: IPv6 support in host resolver caused failure in pjlib initialization

File:

• pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp (modified) (5 diffs)

pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

@@ -214 +214 @@
         }
         
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
         if (appHostResolver6_ == NULL) {
             if (Connection())
@@ -224 +225 @@
                 goto on_error;
         }
+#endif
+        
         
         isResolverInitialized_ = true;
@@ -239 +242 @@
 {
     if (isResolverInitialized_) {
-        hostResolver_.Close();
+                hostResolver_.Close();
+#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
         hostResolver6_.Close();
-        isResolverInitialized_ = false;
+#endif
+        isResolverInitialized_ = false;
     }
 
@@ -324 +329 @@
     err = os->Initialize();
     if (err != KErrNone)
-        goto on_error;
+        return status;
     
     /* Initialize exception ID for the pool. 
@@ -331 +336 @@
     status = pj_exception_id_alloc("PJLIB/No memory", &PJ_NO_MEMORY_EXCEPTION);
     if (status != PJ_SUCCESS)
-        return status;
+        goto on_error;
 
     PJ_LOG(5,(THIS_FILE, "PJLIB initialized."));