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

Rework the start session method in SCP

Browse Source 
The start session method is reworked to pass a response back to the
client.
If the method was successful, a session list entry is created. This
is different to the provious behaviour, where we created the
session list entry unconditionally.

This new arrangement means that we need a different way to avoid
a race condition where two users may try to create a session at the
same time, and end up with the same display. We do this by keeping
track of newly allocated displays as part of the SCP connections. When
we allocate a display, the SCP connection displays are also taken
into account.
This commit is contained in:
matt335672
2025-06-10 11:06:20 +01:00
parent 7baa27a59f
commit 3e38d9be80
17 changed files with 604 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libipm/eicp.c
+57 -6
View File
@@ -44,6 +44,7 @@ msgno_to_str(unsigned short n)
(n == E_EICP_LOGOUT_REQUEST) ? "EICP_LOGOUT_REQUEST" :
(n == E_EICP_CREATE_SESSION_REQUEST) ? "EICP_CREATE_SESSION_REQUEST" :
(n == E_EICP_CREATE_SESSION_RESPONSE) ? "EICP_CREATE_SESSION_RESPONSE" :
NULL;
}
@@ -244,6 +245,23 @@ eicp_get_sys_login_response(struct trans *trans,
return rv;
}
/*****************************************************************************/
int
eicp_send_uds_login_request(struct trans *trans,
int scp_fd)
{
return libipm_msg_out_simple_send(
trans, (int)E_EICP_UDS_LOGIN_REQUEST, "h", scp_fd);
}
/*****************************************************************************/
int
eicp_get_uds_login_request(struct trans *trans,
int *scp_fd)
{
return libipm_msg_in_parse( trans, "h", scp_fd);
}
/*****************************************************************************/
int
eicp_send_logout_request(struct trans *trans)
@@ -255,7 +273,6 @@ eicp_send_logout_request(struct trans *trans)
int
eicp_send_create_session_request(struct trans *trans,
int scp_fd,
unsigned int display,
enum scp_session_type type,
unsigned short width,
@@ -267,8 +284,7 @@ eicp_send_create_session_request(struct trans *trans,
return libipm_msg_out_simple_send(
trans,
(int)E_EICP_CREATE_SESSION_REQUEST,
"huyqqyss",
scp_fd,
"uyqqyss",
display,
type,
width,
@@ -282,7 +298,6 @@ eicp_send_create_session_request(struct trans *trans,
int
eicp_get_create_session_request(struct trans *trans,
int *scp_fd,
unsigned int *display,
enum scp_session_type *type,
unsigned short *width,
@@ -300,8 +315,7 @@ eicp_get_create_session_request(struct trans *trans,
int rv = libipm_msg_in_parse(
trans,
"huyqqyss",
scp_fd,
"uyqqyss",
&i_display,
&i_type,
&i_width,
@@ -322,3 +336,40 @@ eicp_get_create_session_request(struct trans *trans,
return rv;
}
/*****************************************************************************/
int
eicp_send_create_session_response(struct trans *trans,
enum scp_screate_status status,
const struct guid *guid)
{
struct libipm_fsb guid_descriptor = { (void *)guid, sizeof(*guid) };
return libipm_msg_out_simple_send(
trans, (int)E_EICP_CREATE_SESSION_RESPONSE,
"iB", status, &guid_descriptor);
}
/*****************************************************************************/
int
eicp_get_create_session_response(struct trans *trans,
enum scp_screate_status *status,
struct guid *guid)
{
/* Intermediate values */
int32_t i_status;
const struct libipm_fsb guid_descriptor = { (void *)guid, sizeof(*guid) };
int rv = libipm_msg_in_parse(
trans,
"iB",
&i_status,
&guid_descriptor);
if (rv == 0)
{
*status = (enum scp_screate_status)i_status;
}
return rv;
}