Changeset 4248 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

Timestamp:

Sep 8, 2012 1:05:56 AM (12 years ago)

Author:

nanang

Message:

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

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c

@@ -1158 +1158 @@
     }
     /* 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.
      */
     
@@ -1268 +1268 @@
 
     /* 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;
@@ -1548 +1550 @@
     } 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;
@@ -1932 +1934 @@
     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 */