Changeset 3364 for pjproject/trunk

Timestamp:

Nov 12, 2010 7:42:58 AM (14 years ago)

Author:

nanang

Message:

Fix #1157: Fixed Symbian SSL socket to re-align the write (circular) buffer only when all pending write requests are completed, i.e: inside the write completion callback and when the buffer is empty.

File:

• pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp (modified) (3 diffs)

pjproject/trunk/pjlib/src/pj/ssl_sock_symbian.cpp

@@ -1021 +1021 @@
             return;
         }
+    } else {
+        /* Buffer empty, reset the start position */
+        st->start = st->buf;
     }
 }
@@ -1059 +1062 @@
      */
     
-    pj_size_t avail_len = st->max_len - st->len;
     pj_size_t needed_len = *size + sizeof(write_data_t) - 1;
     
@@ -1065 +1067 @@
     needed_len = ((needed_len + 3) >> 2) << 2; 
 
-    /* Block until there is buffer slot available! */
-    while (needed_len >= avail_len) {
+    /* Block until there is buffer slot available and contiguous! */
+    while (st->start + st->len + needed_len > st->buf + st->max_len) {
         pj_symbianos_poll(-1, -1);
-        avail_len = st->max_len - st->len;
-    }
-
-    /* Ok, make sure the new data will not get wrapped */
-    if (st->start + st->len + needed_len > st->buf + st->max_len) {
-        /* Align buffer left */
-        pj_memmove(st->buf, st->start, st->len);
-        st->start = st->buf;
-    }
-    
+    }
+
     /* Push back the send data into the buffer */
     write_data_t *wdata = (write_data_t*)(st->start + st->len);