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

27
sesman/scp_v1.c
Unescape View File

@ -54,7 +54,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
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");
@ -74,7 +75,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
case SCP_SERVER_STATE_SIZE_ERR: case SCP_SERVER_STATE_SIZE_ERR:
/* an unknown scp version was requested, so we shut down the */ /* an unknown scp version was requested, so we shut down the */
/* connection (and log the fact) */ /* connection (and log the fact) */
log_message(LOG_LEVEL_WARNING,"protocol violation. connection closed."); log_message(LOG_LEVEL_WARNING,
"protocol violation. connection closed.");
return; return;
case SCP_SERVER_STATE_NETWORK_ERR: case SCP_SERVER_STATE_NETWORK_ERR:
log_message(LOG_LEVEL_WARNING, "libscp network error."); log_message(LOG_LEVEL_WARNING, "libscp network error.");
@ -89,7 +91,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
default: default:
/* dummy: scp_v1s_request_password won't generate any other */ /* dummy: scp_v1s_request_password won't generate any other */
/* error other than the ones before */ /* 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; return;
} }
} }
@ -97,7 +100,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
if (!data) if (!data)
{ {
scp_v1s_deny_connection(c, "Login failed"); scp_v1s_deny_connection(c, "Login failed");
log_message(LOG_LEVEL_INFO,"Login failed for user %s. Connection terminated", s->username); log_message(LOG_LEVEL_INFO,
"Login failed for user %s. Connection terminated", s->username);
free_session(s); free_session(s);
return; return;
} }
@ -106,7 +110,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
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."); 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); log_message(LOG_LEVEL_INFO,
"User %s not allowed on TS. Connection terminated", s->username);
free_session(s); free_session(s);
return; return;
} }
@ -124,14 +129,14 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
if (SCP_SESSION_TYPE_XVNC == s->type) if (SCP_SESSION_TYPE_XVNC == s->type)
{ {
log_message(LOG_LEVEL_INFO, "starting Xvnc session..."); log_message(LOG_LEVEL_INFO, "starting Xvnc session...");
display = session_start(s->width, s->height, s->bpp, s->username, s->password, display = session_start(s->width, s->height, s->bpp, s->username,
data, SESMAN_SESSION_TYPE_XVNC); s->password, data, SESMAN_SESSION_TYPE_XVNC);
} }
else else
{ {
log_message(LOG_LEVEL_INFO, "starting Xrdp session..."); log_message(LOG_LEVEL_INFO, "starting Xrdp session...");
display = session_start(s->width, s->height, s->bpp, s->username, s->password, display = session_start(s->width, s->height, s->bpp, s->username,
data, SESMAN_SESSION_TYPE_XRDP); s->password, data, SESMAN_SESSION_TYPE_XRDP);
} }
e = scp_v1s_connect_new_session(c, display); e = scp_v1s_connect_new_session(c, display);
@ -162,7 +167,8 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
{ {
display = sitem->display; display = sitem->display;
e = scp_v1s_reconnect_session(c, slist, display); e = scp_v1s_reconnect_session(c, slist, display);
log_message(LOG_LEVEL_INFO, "User %s reconnected to session %d on port %d", \ log_message(LOG_LEVEL_INFO,
"User %s reconnected to session %d on port %d",
s->username, sitem->pid, display); s->username, sitem->pid, display);
} }
g_free(slist); g_free(slist);
@ -170,7 +176,6 @@ scp_v1_process(struct SCP_CONNECTION* c, struct SCP_SESSION* s)
else else
{ {
/* 2 or more disconnected sessions - listing */ /* 2 or more disconnected sessions - listing */
//max session x packet = 100 => pkt size = 1300 (13x100) //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);

Write Preview
Loading…
Cancel
Save