uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

indent

Browse Source
ulab-original
jsorg71 18 years ago
parent 1d5e0008bd
commit c0f0fec1d6
2 changed files with 54 additions and 49 deletions
Show Stats Download Patch File Download Diff File

2
sesman/scp_v0.c
Unescape View File

@ -31,7 +31,7 @@
void DEFAULT_CC
scp_v0_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
{
int display=0;
int display = 0;
long data;
struct session_item* s_item;

77
sesman/scp_v1.c
Unescape View File

@ -46,41 +46,43 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
int scount;
SCP_SID sid;
retries=g_cfg.sec.login_retry;
current_try=retries;
retries = g_cfg.sec.login_retry;
current_try = retries;
data=auth_userpass(s->username, s->password);
data = auth_userpass(s->username, s->password);
LOG_DBG("user: %s\npass: %s", s->username, s->password);
while ((!data) && ((retries==0) || (current_try>0)))
while ((!data) && ((retries == 0) || (current_try > 0)))
{
LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries, current_try, ((!data) && ((retries==0) || (current_try>0))));
LOG_DBG("data %d - retry %d - currenttry %d - expr %d", data, retries,
current_try, ((!data) && ((retries == 0) || (current_try > 0))));
e=scp_v1s_request_password(c,s,"Wrong username and/or password");
e = scp_v1s_request_password(c, s, "Wrong username and/or password");
switch (e)
{
case SCP_SERVER_STATE_OK:
/* all ok, we got new username and password */
data=auth_userpass(s->username, s->password);
data = auth_userpass(s->username, s->password);
/* one try less */
if (current_try>0)
if (current_try > 0)
{
current_try--;
}
break;
case SCP_SERVER_STATE_VERSION_ERR:
LOG_DBG("version error",0)
LOG_DBG("version error", 0)
case SCP_SERVER_STATE_SIZE_ERR:
/* an unknown scp version was requested, so we shut down the */
/* connection (and log the fact) */
log_message(LOG_LEVEL_WARNING,"protocol violation. connection closed.");
log_message(LOG_LEVEL_WARNING,
"protocol violation. connection closed.");
return;
case SCP_SERVER_STATE_NETWORK_ERR:
log_message(LOG_LEVEL_WARNING,"libscp network error.");
log_message(LOG_LEVEL_WARNING, "libscp network error.");
return;
case SCP_SERVER_STATE_SEQUENCE_ERR:
log_message(LOG_LEVEL_WARNING,"libscp sequence error.");
log_message(LOG_LEVEL_WARNING, "libscp sequence error.");
return;
case SCP_SERVER_STATE_INTERNAL_ERR:
/* internal error occurred (eg. malloc() error, ecc.) */
@ -89,24 +91,27 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
default:
/* dummy: scp_v1s_request_password won't generate any other */
/* error other than the ones before */
log_message(LOG_LEVEL_ALWAYS, "unknown return from scp_v1s_request_password()");
log_message(LOG_LEVEL_ALWAYS,
"unknown return from scp_v1s_request_password()");
return;
}
}
if (!data)
{
scp_v1s_deny_connection(c,"Login failed");
log_message(LOG_LEVEL_INFO,"Login failed for user %s. Connection terminated", s->username);
scp_v1s_deny_connection(c, "Login failed");
log_message(LOG_LEVEL_INFO,
"Login failed for user %s. Connection terminated", s->username);
free_session(s);
return;
}
/* testing if login is allowed*/
if (0==access_login_allowed(s->username))
if (0 == access_login_allowed(s->username))
{
scp_v1s_deny_connection(c,"Access to Terminal Server not allowed.");
log_message(LOG_LEVEL_INFO,"User %s not allowed on TS. Connection terminated", s->username);
scp_v1s_deny_connection(c, "Access to Terminal Server not allowed.");
log_message(LOG_LEVEL_INFO,
"User %s not allowed on TS. Connection terminated", s->username);
free_session(s);
return;
}
@ -114,9 +119,9 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
//check if we need password change
/* list disconnected sessions */
slist=session_get_byuser(s->username, &scount);
slist = session_get_byuser(s->username, &scount);
if (scount==0)
if (scount == 0)
{
#warning FIXME we should check for MaxSessions
/* no disconnected sessions - start a new one */
@ -124,45 +129,46 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
if (SCP_SESSION_TYPE_XVNC == s->type)
{
log_message(LOG_LEVEL_INFO, "starting Xvnc session...");
display = session_start(s->width, s->height, s->bpp, s->username, s->password,
data, SESMAN_SESSION_TYPE_XVNC);
display = session_start(s->width, s->height, s->bpp, s->username,
s->password, data, SESMAN_SESSION_TYPE_XVNC);
}
else
{
log_message(LOG_LEVEL_INFO, "starting Xrdp session...");
display = session_start(s->width, s->height, s->bpp, s->username, s->password,
data, SESMAN_SESSION_TYPE_XRDP);
display = session_start(s->width, s->height, s->bpp, s->username,
s->password, data, SESMAN_SESSION_TYPE_XRDP);
}
e=scp_v1s_connect_new_session(c, display);
e = scp_v1s_connect_new_session(c, display);
switch (e)
{
case SCP_SERVER_STATE_OK:
/* all ok, we got new username and password */
break;
case SCP_SERVER_STATE_NETWORK_ERR:
log_message(LOG_LEVEL_WARNING,"libscp network error.");
log_message(LOG_LEVEL_WARNING, "libscp network error.");
return;
default:
return;
}
}
else if (scount==1)
else if (scount == 1)
{
/* there's only one session - returning that */
sitem=session_get_bypid(slist->SID);
sitem = session_get_bypid(slist->SID);
#warning FIXME session_get_by*() should return a malloc()ated struct
#warning FIXME or at least lock the chain
if (0==sitem)
if (0 == sitem)
{
e=scp_v1s_connection_error(c, "Internal error");
e = scp_v1s_connection_error(c, "Internal error");
log_message(LOG_LEVEL_INFO, "Cannot find session item on the chain");
}
else
{
display=sitem->display;
e=scp_v1s_reconnect_session(c, slist, display);
log_message(LOG_LEVEL_INFO, "User %s reconnected to session %d on port %d", \
display = sitem->display;
e = scp_v1s_reconnect_session(c, slist, display);
log_message(LOG_LEVEL_INFO,
"User %s reconnected to session %d on port %d",
s->username, sitem->pid, display);
}
g_free(slist);
@ -170,9 +176,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
else
{
/* 2 or more disconnected sessions - listing */
//max session x packet = 100 => pkt size = 1300 (13x100)
e=scp_v1s_list_sessions(c, scount, slist, &sid);
e = scp_v1s_list_sessions(c, scount, slist, &sid);
//CHECK RETURN
@ -180,7 +185,7 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
}
/* resource management */
if ((e==SCP_SERVER_STATE_OK) && (s->rsr))
if ((e == SCP_SERVER_STATE_OK) && (s->rsr))
{
/* here goes scp resource sharing code */
}

Write Preview
Loading…
Cancel
Save