mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from speidy/master 

libxrdp: work on multimon
This commit is contained in:
jsorg71 2013-10-30 22:08:18 -07:00
parent 7a484c1a79 5591c19b3f
commit f51f9ce679
4 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/xrdp_client_info.h
View File

@ -21,6 +21,15 @@
#if !defined(XRDP_CLIENT_INFO_H)
#define XRDP_CLIENT_INFO_H
struct monitor_info
{
int left;
int top;
int right;
int bottom;
int is_primary;
};
struct xrdp_client_info
{
int size; /* bytes for this structure */
@ -99,7 +108,7 @@ struct xrdp_client_info
int nego_sec_layer; /* 0, 1, 2 = RDP security layer, TLS , Negotiate */
int multimon; /* 0 = deny , 1 = allow */
struct monitor_info minfo[16]; /* client monitor data */
};
#endif

11
libxrdp/libxrdp.h
View File

@ -61,16 +61,6 @@ struct mcs_channel_item
int chanid;
};
/* used in mcs - client monitor data */
struct mcs_monitor_item
{
int left;
int top;
int right;
int bottom;
int is_primary;
};
/* mcs */
struct xrdp_mcs
{
@ -81,7 +71,6 @@ struct xrdp_mcs
struct stream* client_mcs_data;
struct stream* server_mcs_data;
struct list* channel_list;
struct list* monitor_list;
};
/* sec */

14
libxrdp/xrdp_mcs.c
View File

@ -38,7 +38,6 @@ xrdp_mcs_create(struct xrdp_sec *owner, struct trans *trans,
self->server_mcs_data = server_mcs_data;
self->iso_layer = xrdp_iso_create(self, trans);
self->channel_list = list_create();
self->monitor_list = list_create();
DEBUG((" out xrdp_mcs_create"));
return self;
}
@ -48,7 +47,6 @@ void APP_CC
xrdp_mcs_delete(struct xrdp_mcs *self)
{
struct mcs_channel_item *channel_item;
struct mcs_monitor_item *monitor_item;
int index;
int count;
@ -69,18 +67,6 @@ xrdp_mcs_delete(struct xrdp_mcs *self)
list_delete(self->channel_list);
/* here we have to free the monitor items and anything in them */
count = self->monitor_list->count;
for (index = count - 1; index >= 0; index--)
{
monitor_item = (struct mcs_monitor_item *)
list_get_item(self->monitor_list, index);
g_free(monitor_item);
}
list_delete(self->monitor_list);
xrdp_iso_delete(self->iso_layer);
/* make sure we get null pointer exception if struct is used again. */
DEBUG(("xrdp_mcs_delete processed"))

43
libxrdp/xrdp_sec.c
View File

@ -959,7 +959,9 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
int index;
int monitorCount;
int flags;
struct mcs_monitor_item *monitor_item;
struct xrdp_client_info *client_info = (struct xrdp_client_info *)NULL;
client_info = &(self->rdp_layer->client_info);
DEBUG(("processing monitors data, allow_multimon is %d", self->multimon));
/* this is an option set in xrdp.ini */
@ -975,7 +977,7 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
{
DEBUG(("[ERROR] xrdp_sec_process_mcs_data_monitors: flags MUST be "
"zero, detected: %d", flags));
return 0;
return 1;
}
in_uint32_le(s, monitorCount);
//verify monitorCount - max 16
@ -983,24 +985,23 @@ xrdp_sec_process_mcs_data_monitors(struct xrdp_sec *self, struct stream *s)
{
DEBUG(("[ERROR] xrdp_sec_process_mcs_data_monitors: max allowed "
"monitors is 16, detected: %d", monitorCount));
return 0;
}
for (index = 0; index < monitorCount; index++)
{
monitor_item = (struct mcs_monitor_item *)
g_malloc(sizeof(struct mcs_monitor_item), 1);
in_uint32_le(s, monitor_item->left);
in_uint32_le(s, monitor_item->top);
in_uint32_le(s, monitor_item->right);
in_uint32_le(s, monitor_item->bottom);
in_uint32_le(s, monitor_item->is_primary);
list_add_item(self->mcs_layer->monitor_list, (long)monitor_item);
DEBUG(("got monitor: left: %d, top: %d, right: %d, bottom: %d, is "
"primary: %d", monitor_item->left, monitor_item->top,
monitor_item->right, monitor_item->bottom,
monitor_item->is_primary));
return 1;
}
g_writeln("monitorCount= %d", monitorCount); // for debugging only
/* Add client_monitor_data to client_info struct, will later pass to X11rdp */
for (index = 0; index < monitorCount; index++)
{
in_uint32_le(s, client_info->minfo->left);
in_uint32_le(s, client_info->minfo->top);
in_uint32_le(s, client_info->minfo->right);
in_uint32_le(s, client_info->minfo->bottom);
in_uint32_le(s, client_info->minfo->is_primary);
g_writeln("got a monitor: left= %d, top= %d, right= %d, bottom= %d, is_primary?= %d", client_info->minfo->left,
client_info->minfo->top, client_info->minfo->right, client_info->minfo->bottom, client_info->minfo->is_primary);
}
return 0;
}
/*****************************************************************************/
@ -1052,7 +1053,10 @@ xrdp_sec_process_mcs_data(struct xrdp_sec *self)
case SEC_TAG_CLI_4:
break;
case SEC_TAG_CLI_MONITOR:
xrdp_sec_process_mcs_data_monitors(self, s);
if (xrdp_sec_process_mcs_data_monitors(self, s) != 0)
{
return 1;
}
break;
default:
g_writeln("error unknown xrdp_sec_process_mcs_data tag %d size %d",
@ -1210,7 +1214,6 @@ xrdp_sec_in_mcs_data(struct xrdp_sec *self)
client_info->hostname[index] = c;
index++;
}
/* get build */
s->p = s->data;
if (!s_check_rem(s, 43 + 4))