jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use char* for TLS send and receive

Browse Source 
This is consistent with ssl_tls_read() and ssl_tls_write(). C++ warnings
are fixed without adding any casts.
This commit is contained in:
Pavel Roskin 2016-07-08 01:24:31 +00:00
parent cbe413bd8b
commit 0c72ee2371
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/trans.c
View File

@ -28,7 +28,7 @@
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_tls_recv(struct trans *self, void *ptr, int len) trans_tls_recv(struct trans *self, char *ptr, int len)
{ {
if (self->tls == NULL) if (self->tls == NULL)
{ {
@ -39,7 +39,7 @@ trans_tls_recv(struct trans *self, void *ptr, int len)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_tls_send(struct trans *self, const void *data, int len) trans_tls_send(struct trans *self, const char *data, int len)
{ {
if (self->tls == NULL) if (self->tls == NULL)
{ {
@ -61,14 +61,14 @@ trans_tls_can_recv(struct trans *self, int sck, int millis)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_tcp_recv(struct trans *self, void *ptr, int len) trans_tcp_recv(struct trans *self, char *ptr, int len)
{ {
return g_tcp_recv(self->sck, ptr, len, 0); return g_tcp_recv(self->sck, ptr, len, 0);
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_tcp_send(struct trans *self, const void *data, int len) trans_tcp_send(struct trans *self, const char *data, int len)
{ {
return g_tcp_send(self->sck, data, len, 0); return g_tcp_send(self->sck, data, len, 0);
} }

4
common/trans.h
View File

@ -41,8 +41,8 @@ typedef int (DEFAULT_CC *ttrans_data_in)(struct trans* self);
typedef int (DEFAULT_CC *ttrans_conn_in)(struct trans* self, typedef int (DEFAULT_CC *ttrans_conn_in)(struct trans* self,
struct trans* new_self); struct trans* new_self);
typedef int (DEFAULT_CC *tis_term)(void); typedef int (DEFAULT_CC *tis_term)(void);
typedef int (APP_CC *trans_recv_proc) (struct trans *self, void *ptr, int len); typedef int (APP_CC *trans_recv_proc) (struct trans *self, char *ptr, int len);
typedef int (APP_CC *trans_send_proc) (struct trans *self, const void *data, int len); typedef int (APP_CC *trans_send_proc) (struct trans *self, const char *data, int len);
typedef int (APP_CC *trans_can_recv_proc) (struct trans *self, int sck, int millis); typedef int (APP_CC *trans_can_recv_proc) (struct trans *self, int sck, int millis);
/* optional source info */ /* optional source info */