mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unify logging in xrdpapi/* (#1812) 

Migrating logging to LOG() and LOG_DEVEL() in xrdpapi/* (#1812)
This commit is contained in:
aquesnel 2021-03-01 05:09:26 -05:00 committed by GitHub
parent b04fc6f5ab
commit d28f9cd75a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xrdpapi/xrdp-ssh-agent.c
View File

@ -18,7 +18,7 @@
* limitations under the License.
*/
/*
/*
* Portions are from OpenSSH, under the following license:
*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -59,7 +59,7 @@
* xrdp-ssh-agent.c: program to forward ssh-agent protocol from xrdp session
*
* This performs the equivalent function of ssh-agent on a server you connect
* to via ssh, but the ssh-agent protocol is over an RDP dynamic virtual
* to via ssh, but the ssh-agent protocol is over an RDP dynamic virtual
* channel and not an SSH channel.
*
* This will print out variables to set in your environment (specifically,
@ -119,23 +119,23 @@ static int is_going = 1;
void
mktemp_proto(char *s, size_t len)
{
const char *tmpdir;
int r;
const char *tmpdir;
int r;
if ((tmpdir = getenv("TMPDIR")) != NULL)
if ((tmpdir = getenv("TMPDIR")) != NULL)
{
r = snprintf(s, len, "%s/ssh-XXXXXXXXXXXX", tmpdir);
if (r > 0 && (size_t)r < len)
{
r = snprintf(s, len, "%s/ssh-XXXXXXXXXXXX", tmpdir);
if (r > 0 && (size_t)r < len)
{
return;
}
}
r = snprintf(s, len, "/tmp/ssh-XXXXXXXXXXXX");
if (r < 0 || (size_t)r >= len)
{
fprintf(stderr, "%s: template string too short", __func__);
exit(1);
return;
}
}
r = snprintf(s, len, "/tmp/ssh-XXXXXXXXXXXX");
if (r < 0 || (size_t)r >= len)
{
fprintf(stderr, "%s: template string too short", __func__);
exit(1);
}
}
@ -391,7 +391,7 @@ main(int argc, char **argv)
{
socklen_t addrsize = sizeof(addr);
int client_fd = accept(sa_uds_fd,
(struct sockaddr*)&addr,
(struct sockaddr *)&addr,
&addrsize);
handle_connection(client_fd);
close(client_fd);

50
xrdpapi/xrdpapi.c
View File

@ -21,12 +21,6 @@
#include <config_ac.h>
#endif
#define LOG_LEVEL 1
#define LLOG(_level, _args) \
do { if (_level < LOG_LEVEL) { ErrorF _args ; } } while (0)
#define LLOGLN(_level, _args) \
do { if (_level < LOG_LEVEL) { printf _args ; printf("\n"); } } while (0)
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -39,6 +33,7 @@
#include <sys/socket.h>
#include <sys/un.h>
#include "log.h"
#include "xrdp_sockets.h"
#include "xrdpapi.h"
@ -56,9 +51,9 @@ can_send(int sck, int millis);
static int
can_recv(int sck, int millis);
static int
mysend(int sck, const void* adata, int bytes);
mysend(int sck, const void *adata, int bytes);
static int
myrecv(int sck, void* adata, int bytes);
myrecv(int sck, void *adata, int bytes);
/*
* Opens a handle to the server end of a specified virtual channel - this
@ -108,13 +103,13 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
if (SessionId != WTS_CURRENT_SESSION)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: bad SessionId"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: bad SessionId");
return 0;
}
wts = (struct wts_obj *) calloc(1, sizeof(struct wts_obj));
if (wts == NULL)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: calloc failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: calloc failed");
return 0;
}
wts->fd = -1;
@ -127,7 +122,7 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
if (wts->display_num <= 0)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: fatal error; display is 0"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: fatal error; display is <= 0");
free(wts);
return NULL;
}
@ -135,7 +130,7 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
/* we use unix domain socket to communicate with chansrv */
if ((wts->fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: socket failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: socket failed");
free(wts);
return NULL;
}
@ -145,7 +140,7 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
long1 = long1 | O_NONBLOCK;
if (fcntl(wts->fd, F_SETFL, long1) < 0)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: set non-block mode failed"));
LOG(LOG_LEVEL_WARNING, "WTSVirtualChannelOpenEx: set non-block mode failed");
}
/* connect to chansrv session */
@ -166,7 +161,7 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
}
else
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: connect failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: connect failed");
free(wts);
return NULL;
}
@ -175,7 +170,7 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
/* wait for connection to complete */
if (!can_send(wts->fd, 500))
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: can_send failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: can_send failed");
free(wts);
return NULL;
}
@ -183,12 +178,14 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
chan_name_bytes = strlen(pVirtualName);
bytes = 4 + 4 + 4 + chan_name_bytes + 4;
LLOGLN(10, ("WTSVirtualChannelOpenEx: chan_name_bytes %d bytes %d pVirtualName %s", chan_name_bytes, bytes, pVirtualName));
LOG_DEVEL(LOG_LEVEL_DEBUG,
"WTSVirtualChannelOpenEx: chan_name_bytes %d bytes %d pVirtualName %s",
chan_name_bytes, bytes, pVirtualName);
connect_data = (char *) calloc(bytes, 1);
if (connect_data == NULL)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: calloc failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: calloc failed");
free(wts);
return NULL;
}
@ -212,19 +209,20 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
connect_data[4 + 4 + 4 + chan_name_bytes + 2] = (flags >> 16) & 0xFF;
connect_data[4 + 4 + 4 + chan_name_bytes + 3] = (flags >> 24) & 0xFF;
LLOGLN(10, ("WTSVirtualChannelOpenEx: calling mysend with %d bytes", bytes));
LOG_DEVEL(LOG_LEVEL_DEBUG,
"WTSVirtualChannelOpenEx: calling mysend with %d bytes", bytes);
if (mysend(wts->fd, connect_data, bytes) != bytes)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: mysend failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: mysend failed");
free(wts);
return NULL;
}
LLOGLN(10, ("WTSVirtualChannelOpenEx: sent ok"));
LOG_DEVEL(LOG_LEVEL_DEBUG, "WTSVirtualChannelOpenEx: sent ok");
if (!can_recv(wts->fd, 500))
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: can_recv failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: can_recv failed");
free(wts);
return NULL;
}
@ -232,15 +230,15 @@ WTSVirtualChannelOpenEx(unsigned int SessionId, const char *pVirtualName,
/* get response */
if (myrecv(wts->fd, connect_data, 4) != 4)
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: myrecv failed"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: myrecv failed");
free(wts);
return NULL;
}
if ((connect_data[0] != 0) || (connect_data[1] != 0) ||
(connect_data[2] != 0) || (connect_data[3] != 0))
(connect_data[2] != 0) || (connect_data[3] != 0))
{
LLOGLN(0, ("WTSVirtualChannelOpenEx: connect_data not ok"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelOpenEx: connect_data not ok");
free(wts);
return NULL;
}
@ -334,7 +332,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer,
if (wts == 0)
{
LLOGLN(10, ("WTSVirtualChannelWrite: wts is NULL"));
LOG(LOG_LEVEL_ERROR, "WTSVirtualChannelWrite: wts is NULL");
return 0;
}
@ -345,7 +343,7 @@ WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer,
rv = mysend(wts->fd, Buffer, Length);
LLOGLN(10, ("WTSVirtualChannelWrite: mysend() returned %d", rv));
LOG_DEVEL(LOG_LEVEL_DEBUG, "WTSVirtualChannelWrite: mysend() returned %d", rv);
if (rv >= 0)
{

10
xrdpapi/xrdpapi.h
View File

@ -57,19 +57,19 @@ void *WTSVirtualChannelOpen(void *hServer, unsigned int SessionId,
const char *pVirtualName);
void *WTSVirtualChannelOpenEx(unsigned int SessionId,
const char *pVirtualName, unsigned int flags);
const char *pVirtualName, unsigned int flags);
int WTSVirtualChannelWrite(void *hChannelHandle, const char *Buffer,
unsigned int Length, unsigned int *pBytesWritten);
unsigned int Length, unsigned int *pBytesWritten);
int WTSVirtualChannelRead(void *hChannelHandle, unsigned int TimeOut,
char *Buffer, unsigned int BufferSize,
unsigned int *pBytesRead);
char *Buffer, unsigned int BufferSize,
unsigned int *pBytesRead);
int WTSVirtualChannelClose(void *hChannelHandle);
int WTSVirtualChannelQuery(void *hChannelHandle, WTS_VIRTUAL_CLASS WtsVirtualClass,
void **ppBuffer, unsigned int *pBytesReturned);
void **ppBuffer, unsigned int *pBytesReturned);
void WTSFreeMemory(void *pMemory);