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

Timestamp:

Oct 26, 2007 5:25:35 AM (17 years ago)

Author:

bennylp

Message:

Ticket #403: Ability to specify RConnection instance etc in PJLIB Symbian

File:

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

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

@@ -154 +154 @@
 PjSymbianOS::PjSymbianOS()
 : isSocketServInitialized_(false), isResolverInitialized_(false),
-  console_(NULL), selectTimeoutTimer_(NULL)
-{
+  console_(NULL), selectTimeoutTimer_(NULL),
+  appSocketServ_(NULL), appConnection_(NULL), appHostResolver_(NULL)
+{
+}
+
+// Set parameters
+void PjSymbianOS::SetParameters(pj_symbianos_params *params) 
+{
+    appSocketServ_ = (RSocketServ*) params->rsocketserv;
+    appConnection_ = (RConnection*) params->rconnection;
+    appHostResolver_ = (RHostResolver*) params->rhostresolver;
 }
 
@@ -180 +189 @@
 #endif
 
-    if (!isSocketServInitialized_) {
+    /* Only create RSocketServ if application doesn't specify it
+     * in the parameters
+     */
+    if (!isSocketServInitialized_ && appSocketServ_ == NULL) {
         err = socketServ_.Connect();
         if (err != KErrNone)
@@ -188 +200 @@
     }
 
-    if (!isResolverInitialized_) {
-        err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream);
+    if (!isResolverInitialized_ && appHostResolver_ == NULL) {
+        if (Connection())
+            err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream,
+                                     *Connection());
+        else
+            err = hostResolver_.Open(SocketServ(), KAfInet, KSockStream);
+        
         if (err != KErrNone)
             goto on_error;
@@ -258 +275 @@
 {
     return 0;
+}
+
+
+/* Set Symbian specific parameters */
+PJ_DEF(pj_status_t) pj_symbianos_set_params(pj_symbianos_params *prm) 
+{
+    PJ_ASSERT_RETURN(prm != NULL, PJ_EINVAL);
+    PjSymbianOS::Instance()->SetParameters(prm);
+    return PJ_SUCCESS;
 }