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

Merge pull request #2233 from matt335672/uds_fix_ip

Browse Source 
Fix regression introduced with UDS
This commit is contained in:
matt335672 2022-04-20 09:53:39 +01:00 committed by GitHub
commit 6a6f7bb83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xrdp/xrdp.ini.in
View File

@ -231,6 +231,7 @@ name=Xvnc
lib=libvnc.@lib_extension@ lib=libvnc.@lib_extension@
username=ask username=ask
password=ask password=ask
ip=127.0.0.1
port=-1 port=-1
#xserverbpp=24 #xserverbpp=24
#delay_ms=2000 #delay_ms=2000

12
xup/xup.c
View File

@ -162,12 +162,6 @@ lib_mod_connect(struct mod *mod)
return 1; return 1;
} }
if (g_strcmp(mod->ip, "") == 0)
{
mod->server_msg(mod, "error - no ip set", 0);
return 1;
}
make_stream(s); make_stream(s);
g_sprintf(con_port, "%s", mod->port); g_sprintf(con_port, "%s", mod->port);
@ -183,6 +177,12 @@ lib_mod_connect(struct mod *mod)
{ {
socket_mode = TRANS_MODE_TCP; socket_mode = TRANS_MODE_TCP;
LOG(LOG_LEVEL_INFO, "lib_mod_connect: connecting via TCP socket"); LOG(LOG_LEVEL_INFO, "lib_mod_connect: connecting via TCP socket");
if (g_strcmp(mod->ip, "") == 0)
{
mod->server_msg(mod, "error - no ip set", 0);
free_stream(s);
return 1;
}
} }
mod->trans = trans_create(socket_mode, 8 * 8192, 8192); mod->trans = trans_create(socket_mode, 8 * 8192, 8192);