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

common: indent fix

Browse Source
This commit is contained in:
speidy 2014-07-26 09:04:22 +03:00
parent 2cb2de7277
commit 0f9bd232d9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/trans.c
View File

@ -103,7 +103,7 @@ trans_get_wait_objs(struct trans *self, tbus *objs, int *count)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_get_wait_objs_rw(struct trans *self, tbus *robjs, int *rcount, trans_get_wait_objs_rw(struct trans *self, tbus *robjs, int *rcount,
tbus *wobjs, int *wcount) tbus *wobjs, int *wcount)
{ {
if (self == 0) if (self == 0)
{ {
@ -207,7 +207,7 @@ trans_check_wait_objs(struct trans *self)
if (g_tcp_can_recv(self->sck, 0)) if (g_tcp_can_recv(self->sck, 0))
{ {
in_sck = g_sck_accept(self->sck, self->addr, sizeof(self->addr), in_sck = g_sck_accept(self->sck, self->addr, sizeof(self->addr),
self->port, sizeof(self->port)); self->port, sizeof(self->port));
if (in_sck == -1) if (in_sck == -1)
{ {
@ -228,15 +228,15 @@ trans_check_wait_objs(struct trans *self)
if (self->trans_conn_in != 0) /* is function assigned */ if (self->trans_conn_in != 0) /* is function assigned */
{ {
in_trans = trans_create(self->mode, self->in_s->size, in_trans = trans_create(self->mode, self->in_s->size,
self->out_s->size); self->out_s->size);
in_trans->sck = in_sck; in_trans->sck = in_sck;
in_trans->type1 = TRANS_TYPE_SERVER; in_trans->type1 = TRANS_TYPE_SERVER;
in_trans->status = TRANS_STATUS_UP; in_trans->status = TRANS_STATUS_UP;
in_trans->is_term = self->is_term; in_trans->is_term = self->is_term;
g_strncpy(in_trans->addr, self->addr, g_strncpy(in_trans->addr, self->addr,
sizeof(self->addr) - 1); sizeof(self->addr) - 1);
g_strncpy(in_trans->port, self->port, g_strncpy(in_trans->port, self->port,
sizeof(self->port) - 1); sizeof(self->port) - 1);
if (self->trans_conn_in(self, in_trans) != 0) if (self->trans_conn_in(self, in_trans) != 0)
{ {
@ -513,7 +513,7 @@ trans_write_copy(struct trans *self)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
trans_connect(struct trans *self, const char *server, const char *port, trans_connect(struct trans *self, const char *server, const char *port,
int timeout) int timeout)
{ {
int error; int error;

6
common/xrdp_tls.c
View File

@ -83,8 +83,8 @@ xrdp_tls_accept(struct xrdp_tls *self)
self->ctx = SSL_CTX_new(SSLv23_server_method()); self->ctx = SSL_CTX_new(SSLv23_server_method());
/* set context options */ /* set context options */
SSL_CTX_set_mode(self->ctx, SSL_CTX_set_mode(self->ctx,
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER |
| SSL_MODE_ENABLE_PARTIAL_WRITE); SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_options(self->ctx, options); SSL_CTX_set_options(self->ctx, options);
SSL_CTX_set_read_ahead(self->ctx, 1); SSL_CTX_set_read_ahead(self->ctx, 1);
@ -143,7 +143,7 @@ xrdp_tls_print_error(char *func, SSL *connection, int value)
{ {
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
g_writeln("xrdp_tls_print_error: %s: Server closed TLS connection", g_writeln("xrdp_tls_print_error: %s: Server closed TLS connection",
func); func);
return 1; return 1;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ: