Ignore:
Timestamp:
Sep 7, 2012 8:58:48 AM (7 years ago)
Author:
nanang
Message:

Fix #1573:

  • Never hold lock while calling pj_activesock_send*() to avoid deadlock.
  • Refactor the sending buffer management.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pjlib-test/ssl_sock.c

    r3553 r4247  
    13301330} 
    13311331 
     1332#if 0 && (!defined(PJ_SYMBIAN) || PJ_SYMBIAN==0) 
     1333pj_status_t pj_ssl_sock_ossl_test_send_buf(pj_pool_t *pool); 
     1334static int ossl_test_send_buf() 
     1335{ 
     1336    pj_pool_t *pool; 
     1337    pj_status_t status; 
     1338 
     1339    pool = pj_pool_create(mem, "send_buf", 256, 256, NULL); 
     1340    status = pj_ssl_sock_ossl_test_send_buf(pool); 
     1341    pj_pool_release(pool); 
     1342    return status; 
     1343} 
     1344#else 
     1345static int ossl_test_send_buf() 
     1346{ 
     1347    return 0; 
     1348} 
     1349#endif 
    13321350 
    13331351int ssl_sock_test(void) 
    13341352{ 
    13351353    int ret; 
     1354 
     1355    PJ_LOG(3,("", "..test ossl send buf")); 
     1356    ret = ossl_test_send_buf(); 
     1357    if (ret != 0) 
     1358        return ret; 
    13361359 
    13371360    PJ_LOG(3,("", "..get cipher list test")); 
Note: See TracChangeset for help on using the changeset viewer.