diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-09-07 08:58:48 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-09-07 08:58:48 +0000 |
commit | 7c49d2f7b9967572de625772c5e6d51f255fb71b (patch) | |
tree | 9faedd35e987ad804308bd5778bc958d9ffd75a8 /pjlib/src/pjlib-test | |
parent | 06e6dab388f2e916cf7d4e9af79165c440fc0e9b (diff) |
Fix #1573:
- Never hold lock while calling pj_activesock_send*() to avoid deadlock.
- Refactor the sending buffer management.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4247 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pjlib-test')
-rw-r--r-- | pjlib/src/pjlib-test/ssl_sock.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/pjlib/src/pjlib-test/ssl_sock.c b/pjlib/src/pjlib-test/ssl_sock.c index 5392bed5..242c46e6 100644 --- a/pjlib/src/pjlib-test/ssl_sock.c +++ b/pjlib/src/pjlib-test/ssl_sock.c @@ -1329,11 +1329,34 @@ on_return: return status; } +#if 0 && (!defined(PJ_SYMBIAN) || PJ_SYMBIAN==0) +pj_status_t pj_ssl_sock_ossl_test_send_buf(pj_pool_t *pool); +static int ossl_test_send_buf() +{ + pj_pool_t *pool; + pj_status_t status; + + pool = pj_pool_create(mem, "send_buf", 256, 256, NULL); + status = pj_ssl_sock_ossl_test_send_buf(pool); + pj_pool_release(pool); + return status; +} +#else +static int ossl_test_send_buf() +{ + return 0; +} +#endif int ssl_sock_test(void) { int ret; + PJ_LOG(3,("", "..test ossl send buf")); + ret = ossl_test_send_buf(); + if (ret != 0) + return ret; + PJ_LOG(3,("", "..get cipher list test")); ret = get_cipher_list(); if (ret != 0) |