diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2008-12-17 11:36:22 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2008-12-17 11:36:22 +0000 |
commit | b6529acff90535f3f54b57d093bae7bc90139bff (patch) | |
tree | 09d7778c480c91aafd46fec12995db3d43297b0e /pjsip | |
parent | 3b1adf8c9c943ef6c7f8166f4633f88cabb23e99 (diff) |
Ticket #675:
- Fixed ICE+STUN panic E32User-CBASE 46, the problem seems to be inside the Symbian version of pjsua_handle_events().
- Updated minor things, e.g: compile warnings
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2379 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 18 | ||||
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_pres.c | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 650217a2..18bf542a 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -827,13 +827,6 @@ on_error: /* Sleep with polling */ static void busy_sleep(unsigned msec) { -#if defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 - /* Ideally we shouldn't call pj_thread_sleep() and rather - * CActiveScheduler::WaitForAnyRequest() here, but that will - * drag in Symbian header and it doesn't look pretty. - */ - pj_thread_sleep(msec); -#else pj_time_val timeout, now; pj_gettimeofday(&timeout); @@ -845,7 +838,6 @@ static void busy_sleep(unsigned msec) ; pj_gettimeofday(&now); } while (PJ_TIME_VAL_LT(now, timeout)); -#endif } @@ -1203,12 +1195,9 @@ PJ_DEF(pj_status_t) pjsua_start(void) PJ_DEF(int) pjsua_handle_events(unsigned msec_timeout) { #if defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 - /* Ideally we shouldn't call pj_thread_sleep() and rather - * CActiveScheduler::WaitForAnyRequest() here, but that will - * drag in Symbian header and it doesn't look pretty. - */ - pj_thread_sleep(msec_timeout); - return msec_timeout; + + return pj_symbianos_poll(-1, msec_timeout); + #else unsigned count = 0; @@ -1225,6 +1214,7 @@ PJ_DEF(int) pjsua_handle_events(unsigned msec_timeout) return -status; return count; + #endif } diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c index 0e3cc211..41af06a9 100644 --- a/pjsip/src/pjsua-lib/pjsua_pres.c +++ b/pjsip/src/pjsua-lib/pjsua_pres.c @@ -776,7 +776,7 @@ static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata) else uapres->expires = -1; - st_code = 200; + st_code = (pjsip_status_code)200; reason = pj_str("OK"); pjsua_msg_data_init(&msg_data); |