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

Merge pull request #1441 from Belinsky-L-V/accept-neg1-cid

Browse Source 
make vsock config accept -1 for cid and port
This commit is contained in:
jsorg71 2019-11-14 01:20:51 -08:00 committed by GitHub
commit 36fc802bd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
xrdp/xrdp_listen.c
View File

@ -356,6 +356,53 @@ xrdp_listen_parse_integer(char *strout, int strout_max,
return count; return count;
} }
/*****************************************************************************/
static int
xrdp_listen_parse_vsock(char *strout, int strout_max,
const char *strin, int strin_max)
{
int count;
int in;
int strin_index;
int strout_index;
strin_index = 0;
strout_index = 0;
in = 0;
count = 0;
while ((strin_index < strin_max) && (strout_index < strout_max))
{
if (in)
{
if ((strin[strin_index] >= '0') && (strin[strin_index] <= '9'))
{
strout[strout_index++] = strin[strin_index++];
count++;
continue;
}
else
{
break;
}
}
else
{
if (((strin[strin_index] >= '0') && (strin[strin_index] <= '9')) ||
(strin[strin_index] == '-'))
{
in = 1;
strout[strout_index++] = strin[strin_index++];
count++;
continue;
}
}
strin_index++;
count++;
}
strout[strout_index] = 0;
return count;
}
/*****************************************************************************/ /*****************************************************************************/
static int static int
xrdp_listen_parse_ipv4(char *strout, int strout_max, xrdp_listen_parse_ipv4(char *strout, int strout_max,
@ -559,10 +606,10 @@ xrdp_listen_pp(struct xrdp_listen *self, int *index,
{ {
str += 8; str += 8;
lindex += 8; lindex += 8;
bytes = xrdp_listen_parse_integer(address, 128, str, str_end - str); bytes = xrdp_listen_parse_vsock(address, 128, str, str_end - str);
str += bytes; str += bytes;
lindex += bytes; lindex += bytes;
bytes = xrdp_listen_parse_integer(port, 128, str, str_end - str); bytes = xrdp_listen_parse_vsock(port, 128, str, str_end - str);
str += bytes; str += bytes;
lindex += bytes; lindex += bytes;
*mode = TRANS_MODE_VSOCK; *mode = TRANS_MODE_VSOCK;