Changeset 1601 for pjproject/trunk/pjlib/src/pj/os_core_symbian.cpp

Timestamp:

Dec 1, 2007 8:52:57 AM (16 years ago)

Author:

bennylp

Message:

More ticket #415: more IPv6 and some reorganization of the source codes

File:

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

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

@@ -155 +155 @@
 : isSocketServInitialized_(false), isResolverInitialized_(false),
   console_(NULL), selectTimeoutTimer_(NULL),
-  appSocketServ_(NULL), appConnection_(NULL), appHostResolver_(NULL)
+  appSocketServ_(NULL), appConnection_(NULL), appHostResolver_(NULL),
+  appHostResolver6_(NULL)
 {
 }
@@ -165 +166 @@
     appConnection_ = (RConnection*) params->rconnection;
     appHostResolver_ = (RHostResolver*) params->rhostresolver;
+    appHostResolver6_ = (RHostResolver*) params->rhostresolver6;
 }
 
@@ -200 +202 @@
     }
 
-    if (!isResolverInitialized_ && appHostResolver_ == NULL) {
-        if (Connection())
-            err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream,
-                                     *Connection());
-        else
-            err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream);
+    if (!isResolverInitialized_) {
+        if (appHostResolver_ == NULL) {
+            if (Connection())
+                err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream,
+                                         *Connection());
+            else
+                err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream);
         
-        if (err != KErrNone)
-            goto on_error;
-
+            if (err != KErrNone)
+                goto on_error;
+        }
+        
+        if (appHostResolver6_ == NULL) {
+            if (Connection())
+                err = hostResolver6_.Open(SocketServ(), KAfInet6, KSockStream,
+                                          *Connection());
+            else
+                err = hostResolver6_.Open(SocketServ(), KAfInet6, KSockStream);
+        
+            if (err != KErrNone)
+                goto on_error;
+        }
+        
         isResolverInitialized_ = true;
     }
@@ -225 +240 @@
     if (isResolverInitialized_) {
         hostResolver_.Close();
+        hostResolver6_.Close();
         isResolverInitialized_ = false;
     }