diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2012-09-08 01:05:56 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2012-09-08 01:05:56 +0000 |
| commit | ed6d1e92d9166c9dec63aa97f59da112dcbe1fa9 (patch) | |
| tree | 1d6c41f8c3514991b097b157065c668ddb27b123 /pjlib | |
| parent | 7c49d2f7b9967572de625772c5e6d51f255fb71b (diff) | |
Re #1573: Fixed bad cast on ioqueue send key to send data in asock_on_data_sent().
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4248 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index fcbab9a8..366337f3 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -1157,7 +1157,7 @@ static void free_send_data(pj_ssl_sock_t *ssock, write_data_t *wdata) } } /* For data in the middle buffer, just do nothing on the buffer. The slot - * will be freed when freeing other data that is in the first/last. + * will be freed later when freeing the first/last data. */ /* Remove the data from send pending list */ @@ -1267,6 +1267,8 @@ static pj_status_t flush_write_bio(pj_ssl_sock_t *ssock, } /* Copy the data and set its properties into the send data */ + pj_ioqueue_op_key_init(&wdata->key, sizeof(pj_ioqueue_op_key_t)); + wdata->key.user_data = wdata; wdata->app_key = send_key; wdata->record_len = needed_len; wdata->data_len = len; @@ -1547,7 +1549,7 @@ static pj_bool_t asock_on_data_sent (pj_activesock_t *asock, } else if (send_key != &ssock->handshake_op_key) { /* Some data has been sent, notify application */ - write_data_t *wdata = (write_data_t*)send_key; + write_data_t *wdata = (write_data_t*)send_key->user_data; if (ssock->param.cb.on_data_sent) { pj_bool_t ret; ret = (*ssock->param.cb.on_data_sent)(ssock, wdata->app_key, @@ -1931,6 +1933,8 @@ PJ_DEF(pj_status_t) pj_ssl_sock_create (pj_pool_t *pool, pj_list_init(&ssock->write_pending_empty); pj_list_init(&ssock->send_pending); pj_timer_entry_init(&ssock->timer, 0, ssock, &on_timer); + pj_ioqueue_op_key_init(&ssock->handshake_op_key, + sizeof(pj_ioqueue_op_key_t)); /* Create secure socket mutex */ status = pj_lock_create_recursive_mutex(pool, pool->obj_name, |