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

Removing duplicate logging statements

Browse Source
This commit is contained in:
Alexandre Quesnel 2020-12-12 17:05:09 +00:00
parent a82ee03d4d
commit 121c17e818
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libxrdp/xrdp_caps.c
View File

@ -525,8 +525,8 @@ xrdp_caps_process_codecs(struct xrdp_rdp *self, struct stream *s, int len)
/* make sure that requested quality is between 0 to 100 */ /* make sure that requested quality is between 0 to 100 */
if (self->client_info.jpeg_prop[0] < 0 || self->client_info.jpeg_prop[0] > 100) if (self->client_info.jpeg_prop[0] < 0 || self->client_info.jpeg_prop[0] > 100)
{ {
LOG_DEVEL(LOG_LEVEL_WARNING, " Warning: the requested jpeg quality (%d) is invalid," LOG(LOG_LEVEL_WARNING, " Warning: the requested jpeg quality (%d) is invalid, "
" falling back to default", self->client_info.jpeg_prop[0]); "falling back to default", self->client_info.jpeg_prop[0]);
self->client_info.jpeg_prop[0] = 75; /* use default */ self->client_info.jpeg_prop[0] = 75; /* use default */
} }
LOG(LOG_LEVEL_INFO, " jpeg quality set to %d", self->client_info.jpeg_prop[0]); LOG(LOG_LEVEL_INFO, " jpeg quality set to %d", self->client_info.jpeg_prop[0]);

4
libxrdp/xrdp_rdp.c
View File

@ -460,7 +460,6 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
if (error != 0) if (error != 0)
{ {
LOG(LOG_LEVEL_ERROR, "out xrdp_rdp_recv error"); LOG(LOG_LEVEL_ERROR, "out xrdp_rdp_recv error");
LOG(LOG_LEVEL_ERROR, "xrdp_rdp_recv: xrdp_sec_recv failed");
return 1; return 1;
} }
@ -499,9 +498,8 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
{ {
s->next_packet = 0; s->next_packet = 0;
*code = 0; *code = 0;
LOG_DEVEL(LOG_LEVEL_TRACE, "out (3) xrdp_rdp_recv");
len = (int)(s->end - s->p); len = (int)(s->end - s->p);
LOG_DEVEL(LOG_LEVEL_TRACE, "xrdp_rdp_recv: bad RDP packet, length [%d]", len); LOG_DEVEL(LOG_LEVEL_TRACE, "out (3) xrdp_rdp_recv: bad RDP packet, length [%d]", len);
return 0; return 0;
} }
else else

2
libxrdp/xrdp_sec.c
View File

@ -685,7 +685,6 @@ xrdp_sec_process_logon_info(struct xrdp_sec *self, struct stream *s)
if ((flags & RDP_LOGON_NORMAL) != RDP_LOGON_NORMAL) /* 0x33 */ if ((flags & RDP_LOGON_NORMAL) != RDP_LOGON_NORMAL) /* 0x33 */
{ {
/* must be or error */ /* must be or error */
LOG(LOG_LEVEL_ERROR, "xrdp_sec_process_logon_info: flags wrong, major error");
LOG(LOG_LEVEL_ERROR, "xrdp_sec_process_logon_info: flags wrong, likely decrypt " LOG(LOG_LEVEL_ERROR, "xrdp_sec_process_logon_info: flags wrong, likely decrypt "
"not working"); "not working");
return 1; return 1;
@ -1253,7 +1252,6 @@ xrdp_sec_recv(struct xrdp_sec *self, struct stream *s, int *chan)
if (xrdp_mcs_recv(self->mcs_layer, s, chan) != 0) if (xrdp_mcs_recv(self->mcs_layer, s, chan) != 0)
{ {
LOG(LOG_LEVEL_ERROR, " out xrdp_sec_recv : error"); LOG(LOG_LEVEL_ERROR, " out xrdp_sec_recv : error");
LOG(LOG_LEVEL_ERROR, "xrdp_sec_recv: xrdp_mcs_recv failed");
return 1; return 1;
} }