Changeset 4248


Ignore:
Timestamp:
Sep 8, 2012 1:05:56 AM (7 years ago)
Author:
nanang
Message:

Re #1573: Fixed bad cast on ioqueue send key to send data in asock_on_data_sent().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

    r4247 r4248  
    11581158    } 
    11591159    /* For data in the middle buffer, just do nothing on the buffer. The slot 
    1160      * will be freed when freeing other data that is in the first/last. 
     1160     * will be freed later when freeing the first/last data. 
    11611161     */ 
    11621162     
     
    12681268 
    12691269    /* Copy the data and set its properties into the send data */ 
     1270    pj_ioqueue_op_key_init(&wdata->key, sizeof(pj_ioqueue_op_key_t)); 
     1271    wdata->key.user_data = wdata; 
    12701272    wdata->app_key = send_key; 
    12711273    wdata->record_len = needed_len; 
     
    15481550    } else if (send_key != &ssock->handshake_op_key) { 
    15491551        /* Some data has been sent, notify application */ 
    1550         write_data_t *wdata = (write_data_t*)send_key; 
     1552        write_data_t *wdata = (write_data_t*)send_key->user_data; 
    15511553        if (ssock->param.cb.on_data_sent) { 
    15521554            pj_bool_t ret; 
     
    19321934    pj_list_init(&ssock->send_pending); 
    19331935    pj_timer_entry_init(&ssock->timer, 0, ssock, &on_timer); 
     1936    pj_ioqueue_op_key_init(&ssock->handshake_op_key, 
     1937                           sizeof(pj_ioqueue_op_key_t)); 
    19341938 
    19351939    /* Create secure socket mutex */ 
Note: See TracChangeset for help on using the changeset viewer.