diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-12-28 19:00:33 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-12-28 19:00:33 +0000 |
| commit | 8fae955b81af4c3fab42d984c3885528ae806251 (patch) | |
| tree | d2a24ed6708990edc4664852044e2bf5be9b6d3b /pjlib | |
| parent | 4cc0627a188a719358d9deb8a884b3941ee86820 (diff) | |
Ticket #436: IPv6 support in host resolver caused failure in pjlib initialization
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1642 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/os_core_symbian.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pjlib/src/pj/os_core_symbian.cpp b/pjlib/src/pj/os_core_symbian.cpp index c193fb5b..b1b2ae68 100644 --- a/pjlib/src/pj/os_core_symbian.cpp +++ b/pjlib/src/pj/os_core_symbian.cpp @@ -213,6 +213,7 @@ TInt PjSymbianOS::Initialize() goto on_error; } +#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 if (appHostResolver6_ == NULL) { if (Connection()) err = hostResolver6_.Open(SocketServ(), KAfInet6, KSockStream, @@ -223,6 +224,8 @@ TInt PjSymbianOS::Initialize() if (err != KErrNone) goto on_error; } +#endif + isResolverInitialized_ = true; } @@ -238,9 +241,11 @@ on_error: void PjSymbianOS::Shutdown() { if (isResolverInitialized_) { - hostResolver_.Close(); + hostResolver_.Close(); +#if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 hostResolver6_.Close(); - isResolverInitialized_ = false; +#endif + isResolverInitialized_ = false; } if (isSocketServInitialized_) { @@ -323,14 +328,14 @@ PJ_DEF(pj_status_t) pj_init(void) TInt err; err = os->Initialize(); if (err != KErrNone) - goto on_error; + return status; /* Initialize exception ID for the pool. * Must do so after critical section is configured. */ 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.")); return PJ_SUCCESS; |