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

Rename session_list module functions

Browse Source 
Rename functions in the session_list module so it's clearer where
they are defined.
This commit is contained in:
matt335672
2023-03-24 10:53:23 +00:00
parent fb25de0419
commit 5cb5542d91
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sesman/scp_process.c
+7 -7
View File
@@ -212,7 +212,7 @@ allocate_and_start_session(struct auth_info *auth_info,
struct session_chain *temp = (struct session_chain *)NULL;
/* check to limit concurrent sessions */
if (session_get_count() >= (unsigned int)g_cfg->sess.max_sessions)
if (session_list_get_count() >= (unsigned int)g_cfg->sess.max_sessions)
{
LOG(LOG_LEVEL_ERROR, "max concurrent session limit "
"exceeded. login for user %s denied", username);
@@ -299,7 +299,7 @@ allocate_and_start_session(struct auth_info *auth_info,
temp->item->type = params->type;
temp->item->status = SESMAN_SESSION_STATUS_ACTIVE;
session_chain_add(temp);
session_list_add(temp);
return E_SCP_SCREATE_OK;
}
@@ -513,8 +513,8 @@ process_create_session_request(struct sesman_con *sc)
sc->peername, sc->username);
struct session_item *s_item =
session_get_bydata(sc->uid, sp.type, sp.width, sp.height,
sp.bpp, sc->ip_addr);
session_list_get_bydata(sc->uid, sp.type, sp.width, sp.height,
sp.bpp, sc->ip_addr);
if (s_item != 0)
{
// Found an existing session
@@ -544,7 +544,7 @@ process_create_session_request(struct sesman_con *sc)
//
// Get the rest of the parameters for the session
guid = guid_new();
display = session_get_available_display();
display = session_list_get_available_display();
sp.guid = guid;
sp.display = display;
@@ -612,8 +612,8 @@ process_list_sessions_request(struct sesman_con *sc)
"Received request from %s to list sessions for user %s",
sc->peername, sc->username);
info = session_get_byuid(sc->uid, &cnt,
SESMAN_SESSION_STATUS_ALL);
info = session_list_get_byuid(sc->uid, &cnt,
SESMAN_SESSION_STATUS_ALL);
for (i = 0; rv == 0 && i < cnt; ++i)
{
sesman/session_list.c
+16 -16
View File
@@ -49,14 +49,14 @@ static int g_session_count;
/******************************************************************************/
unsigned int
session_get_count(void)
session_list_get_count(void)
{
return g_session_count;
}
/******************************************************************************/
void
session_chain_add(struct session_chain *element)
session_list_add(struct session_chain *element)
{
element->next = g_sessions;
g_sessions = element;
@@ -65,12 +65,12 @@ session_chain_add(struct session_chain *element)
/******************************************************************************/
struct session_item *
session_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr)
session_list_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr)
{
char policy_str[64];
struct session_chain *tmp;
@@ -264,7 +264,7 @@ x_server_running_check_ports(int display)
/* called with the main thread
returns boolean */
static int
session_is_display_in_chain(int display)
is_display_in_chain(int display)
{
struct session_chain *chain;
struct session_item *item;
@@ -288,7 +288,7 @@ session_is_display_in_chain(int display)
/******************************************************************************/
int
session_get_available_display(void)
session_list_get_available_display(void)
{
int display;
@@ -296,7 +296,7 @@ session_get_available_display(void)
while ((display - g_cfg->sess.x11_display_offset) <= g_cfg->sess.max_sessions)
{
if (!session_is_display_in_chain(display))
if (!is_display_in_chain(display))
{
if (!x_server_running_check_ports(display))
{
@@ -342,7 +342,7 @@ username_from_uid(int uid, char *uname, int uname_len)
/******************************************************************************/
enum session_kill_status
session_kill(int pid)
session_list_kill(int pid)
{
struct session_chain *tmp;
struct session_chain *prev;
@@ -418,7 +418,7 @@ session_kill(int pid)
/******************************************************************************/
void
session_sigkill_all(void)
session_list_sigkill_all(void)
{
struct session_chain *tmp;
@@ -442,7 +442,7 @@ session_sigkill_all(void)
/******************************************************************************/
struct session_item *
session_get_bypid(int pid)
session_list_get_bypid(int pid)
{
struct session_chain *tmp;
struct session_item *dummy;
@@ -482,7 +482,7 @@ session_get_bypid(int pid)
/******************************************************************************/
struct scp_session_info *
session_get_byuid(int uid, unsigned int *cnt, unsigned char flags)
session_list_get_byuid(int uid, unsigned int *cnt, unsigned char flags)
{
struct session_chain *tmp;
struct scp_session_info *sess;
@@ -498,7 +498,7 @@ session_get_byuid(int uid, unsigned int *cnt, unsigned char flags)
{
if (uid == tmp->item->uid)
{
LOG(LOG_LEVEL_DEBUG, "session_get_byuser: status=%d, flags=%d, "
LOG(LOG_LEVEL_DEBUG, "session_list_get_byuid: status=%d, flags=%d, "
"result=%d", (tmp->item->status), flags,
((tmp->item->status) & flags));
sesman/session_list.h
+13 -13
View File
@@ -89,19 +89,19 @@ struct session_chain
* @return Session count
*/
unsigned int
session_get_count(void);
session_list_get_count(void);
/**
* Adds a new session item to the chain
*/
void
session_chain_add(struct session_chain *element);
session_list_add(struct session_chain *element);
/**
* Get the next available display
*/
int
session_get_available_display(void);
session_list_get_available_display(void);
/**
@@ -111,12 +111,12 @@ session_get_available_display(void);
*
*/
struct session_item *
session_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr);
session_list_get_bydata(uid_t uid,
enum scp_session_type type,
unsigned short width,
unsigned short height,
unsigned char bpp,
const char *ip_addr);
/**
*
@@ -126,7 +126,7 @@ session_get_bydata(uid_t uid,
*
*/
enum session_kill_status
session_kill(int pid);
session_list_kill(int pid);
/**
*
@@ -135,7 +135,7 @@ session_kill(int pid);
*
*/
void
session_sigkill_all(void);
session_list_sigkill_all(void);
/**
*
@@ -145,7 +145,7 @@ session_sigkill_all(void);
*
*/
struct session_item *
session_get_bypid(int pid);
session_list_get_bypid(int pid);
/**
*
@@ -157,7 +157,7 @@ session_get_bypid(int pid);
*
*/
struct scp_session_info *
session_get_byuid(int uid, unsigned int *cnt, unsigned char flags);
session_list_get_byuid(int uid, unsigned int *cnt, unsigned char flags);
/**
*
sesman/sig.c
+1 -1
View File
@@ -111,7 +111,7 @@ sig_sesman_session_end(void)
{
LOG(LOG_LEVEL_INFO, "Process %d has exited", pid);
session_kill(pid);
session_list_kill(pid);
}
}
while (pid > 0);