planix.org
/
actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reformatted 

FossilOrigin-Name: 9eb005747fa72c6879f11b4438b19ee33726b75fe288f963e77b00c493233db2
This commit is contained in:
7u83@mail.ru 2018-02-18 00:28:11 +00:00
parent 245d7a0338
commit cd5c78f57c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cw/dtls_bio.c
View File

@ -36,7 +36,7 @@
* @param out where to write data to * @param out where to write data to
* @param maxlen maximum number of bytes to read * @param maxlen maximum number of bytes to read
* @return the number of bytes read * @return the number of bytes read
*/ */
int dtls_bio_read(struct conn *conn, char *out, int maxlen) int dtls_bio_read(struct conn *conn, char *out, int maxlen)
{ {
if (conn->dtls_buffer_len == 0) { if (conn->dtls_buffer_len == 0) {
@ -51,8 +51,8 @@ int dtls_bio_read(struct conn *conn, char *out, int maxlen)
memcpy(out, conn->dtls_buffer + conn->dtls_buffer_pos, maxlen); memcpy(out, conn->dtls_buffer + conn->dtls_buffer_pos, maxlen);
conn->dtls_buffer_len -= maxlen; conn->dtls_buffer_len -= maxlen;
conn->dtls_buffer_pos += maxlen; conn->dtls_buffer_pos += maxlen;
cw_dbg(DBG_DTLS_BIO, "SSL BIO read: (maxlen = %d), read %d, remain %d", maxlen, cw_dbg(DBG_DTLS_BIO, "SSL BIO read: (maxlen = %d), read %d, remain %d",
maxlen, conn->dtls_buffer_len); maxlen, maxlen, conn->dtls_buffer_len);
cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) out, maxlen, "Dump..."); cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) out, maxlen, "Dump...");
return maxlen; return maxlen;
@ -61,8 +61,8 @@ int dtls_bio_read(struct conn *conn, char *out, int maxlen)
memcpy(out, conn->dtls_buffer + conn->dtls_buffer_pos, conn->dtls_buffer_len); memcpy(out, conn->dtls_buffer + conn->dtls_buffer_pos, conn->dtls_buffer_len);
int ret = conn->dtls_buffer_len; int ret = conn->dtls_buffer_len;
conn->dtls_buffer_len = 0; conn->dtls_buffer_len = 0;
cw_dbg(DBG_DTLS_BIO, "SSL BIO read: (maxlen = %d), read %d, remain %d", maxlen, ret, cw_dbg(DBG_DTLS_BIO, "SSL BIO read: (maxlen = %d), read %d, remain %d", maxlen,
conn->dtls_buffer_len); ret, conn->dtls_buffer_len);
cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) out, ret, "Dump..."); cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) out, ret, "Dump...");
return ret; return ret;
} }
@ -80,14 +80,13 @@ int dtls_bio_write(struct conn *conn, const char *data, int len)
*((uint32_t *) buffer) = htonl(1 << 24); *((uint32_t *) buffer) = htonl(1 << 24);
memcpy(buffer + 4, data, len); memcpy(buffer + 4, data, len);
int rc = conn->send_packet(conn, buffer, len + 4); int rc = conn->send_packet(conn, buffer, len + 4);
if (rc>=0) if (rc >= 0)
rc-=4; rc -= 4;
cw_dbg(DBG_DTLS_BIO, "SSL BIO write: %d bytes, wrote=%d, ptr: %p", len, rc, data); cw_dbg(DBG_DTLS_BIO, "SSL BIO write: %d bytes, wrote=%d, ptr: %p", len, rc, data);
cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) data, len, "Dump ..."); cw_dbg_dmp(DBG_DTLS_BIO_DMP, (uint8_t *) data, len, "Dump ...");
if (rc < 0) if (rc < 0)
return rc; return rc;
return rc ; return rc;
} }