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

chansrv: make sure ~/xrdp_client exists, other cleanups

Browse Source
This commit is contained in:
Jay Sorg 2012-11-07 22:48:18 -08:00
parent 8a700017ba
commit 514c9ad846
2 changed files with 68 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sesman/chansrv/chansrv_fuse.c
View File

@ -168,7 +168,7 @@ xrdp_ffi2stat(struct xfuse_file_info *ffi, struct stat *stbuf)
} }
else else
{ {
stbuf->st_mode = S_IFREG | 0444; stbuf->st_mode = S_IFREG | 0664;
stbuf->st_nlink = 1; stbuf->st_nlink = 1;
stbuf->st_size = ffi->size; stbuf->st_size = ffi->size;
stbuf->st_uid = g_uid; stbuf->st_uid = g_uid;
@ -541,12 +541,21 @@ fuse_init(void)
char *param0 = "xrdp-chansrv"; char *param0 = "xrdp-chansrv";
char *argv[4]; char *argv[4];
g_snprintf(g_fuse_root_path, 255, "%s/xrdp_client", g_getenv("HOME"));
LLOGLN(0, ("fuse_init: using root_path [%s]", g_fuse_root_path));
if (g_ch != 0) if (g_ch != 0)
{ {
return 0; return 0;
} }
g_snprintf(g_fuse_root_path, 255, "%s/xrdp_client", g_getenv("HOME"));
LLOGLN(0, ("fuse_init: using root_path [%s]", g_fuse_root_path));
if (!g_directory_exist(g_fuse_root_path))
{
if (!g_create_dir(g_fuse_root_path))
{
LLOGLN(0, ("fuse_init: g_create_dir failed [%s]",
g_fuse_root_path));
return 1;
}
}
g_time = g_time1(); g_time = g_time1();
g_uid = g_getuid(); g_uid = g_getuid();
g_gid = g_getgid(); g_gid = g_getgid();

96
sesman/chansrv/clipboard_file.c
View File

@ -28,6 +28,7 @@
#include "arch.h" #include "arch.h"
#include "parse.h" #include "parse.h"
#include "os_calls.h" #include "os_calls.h"
#include "list.h"
#include "chansrv.h" #include "chansrv.h"
#include "clipboard.h" #include "clipboard.h"
#include "clipboard_file.h" #include "clipboard_file.h"
@ -63,8 +64,9 @@ struct cb_file_info
tui64 time; tui64 time;
}; };
static struct cb_file_info g_files[64]; static struct list *g_files_list = 0;
static int g_num_files = 0;
/* used when server is asking for file info from the client */
static int g_file_request_sent_type = 0; static int g_file_request_sent_type = 0;
/* number of seconds from 1 Jan. 1601 00:00 to 1 Jan 1970 00:00 UTC */ /* number of seconds from 1 Jan. 1601 00:00 to 1 Jan 1970 00:00 UTC */
@ -130,17 +132,15 @@ clipboard_get_file(char* file, int bytes)
char full_fn[256]; /* /etc/xrdp/xrdp.ini */ char full_fn[256]; /* /etc/xrdp/xrdp.ini */
char filename[256]; /* xrdp.ini */ char filename[256]; /* xrdp.ini */
char pathname[256]; /* /etc/xrdp */ char pathname[256]; /* /etc/xrdp */
struct cb_file_info *cfi;
/* x-special/gnome-copied-files */ /* x-special/gnome-copied-files */
if ((g_strncmp(file, "copy", 4) == 0) && (bytes == 4)) if ((g_strncmp(file, "copy", 4) == 0) && (bytes == 4))
{ {
g_writeln("jay");
return 0; return 0;
} }
if ((g_strncmp(file, "cut", 3) == 0) && (bytes == 3)) if ((g_strncmp(file, "cut", 3) == 0) && (bytes == 3))
{ {
g_writeln("jay");
return 0; return 0;
} }
sindex = 0; sindex = 0;
@ -186,16 +186,15 @@ clipboard_get_file(char* file, int bytes)
} }
else else
{ {
g_strcpy(g_files[g_num_files].filename, filename); cfi = (struct cb_file_info*)g_malloc(sizeof(struct cb_file_info), 1);
g_strcpy(g_files[g_num_files].pathname, pathname); list_add_item(g_files_list, (tintptr)cfi);
g_files[g_num_files].size = g_file_get_size(full_fn); g_strcpy(cfi->filename, filename);
g_files[g_num_files].flags = flags; g_strcpy(cfi->pathname, pathname);
g_files[g_num_files].time = (g_time1() + CB_EPOCH_DIFF) * 10000000LL; cfi->size = g_file_get_size(full_fn);
g_writeln("ok filename [%s] pathname [%s] size [%d]", cfi->flags = flags;
g_files[g_num_files].filename, cfi->time = (g_time1() + CB_EPOCH_DIFF) * 10000000LL;
g_files[g_num_files].pathname, LLOGLN(0, ("ok filename [%s] pathname [%s] size [%d]",
g_files[g_num_files].size); cfi->filename, cfi->pathname, cfi->size));
g_num_files++;
} }
return 0; return 0;
} }
@ -208,7 +207,6 @@ clipboard_get_files(char *files, int bytes)
int file_index; int file_index;
char file[512]; char file[512];
g_num_files = 0;
file_index = 0; file_index = 0;
for (index = 0; index < bytes; index++) for (index = 0; index < bytes; index++)
{ {
@ -227,10 +225,6 @@ clipboard_get_files(char *files, int bytes)
file[file_index] = files[index]; file[file_index] = files[index];
file_index++; file_index++;
} }
if (g_num_files > 60)
{
break;
}
} }
if (file_index > 0) if (file_index > 0)
{ {
@ -238,7 +232,7 @@ clipboard_get_files(char *files, int bytes)
{ {
} }
} }
if (g_num_files < 1) if (g_files_list->count < 1)
{ {
return 1; return 1;
} }
@ -260,12 +254,19 @@ clipboard_send_data_response_for_file(char *data, int data_size)
int index; int index;
tui32 ui32; tui32 ui32;
char fn[256]; char fn[256];
struct cb_file_info *cfi;
LLOGLN(10, ("clipboard_send_data_response_for_file: data_size %d", LLOGLN(10, ("clipboard_send_data_response_for_file: data_size %d",
data_size)); data_size));
//g_hexdump(data, data_size); //g_hexdump(data, data_size);
if (g_files_list == 0)
{
g_files_list = list_create();
g_files_list->auto_free = 1;
}
list_clear(g_files_list);
clipboard_get_files(data, data_size); clipboard_get_files(data, data_size);
cItems = g_num_files; cItems = g_files_list->count;
bytes_after_header = cItems * 592 + 4; bytes_after_header = cItems * 592 + 4;
make_stream(s); make_stream(s);
init_stream(s, 64 + bytes_after_header); init_stream(s, 64 + bytes_after_header);
@ -275,32 +276,31 @@ clipboard_send_data_response_for_file(char *data, int data_size)
out_uint32_le(s, cItems); out_uint32_le(s, cItems);
for (index = 0; index < cItems; index++) for (index = 0; index < cItems; index++)
{ {
cfi = (struct cb_file_info *)list_get_item(g_files_list, index);
flags = CB_FD_ATTRIBUTES | CB_FD_FILESIZE | CB_FD_WRITESTIME | CB_FD_PROGRESSUI; flags = CB_FD_ATTRIBUTES | CB_FD_FILESIZE | CB_FD_WRITESTIME | CB_FD_PROGRESSUI;
out_uint32_le(s, flags); out_uint32_le(s, flags);
out_uint8s(s, 32); /* reserved1 */ out_uint8s(s, 32); /* reserved1 */
flags = g_files[index].flags; flags = cfi->flags;
out_uint32_le(s, flags); out_uint32_le(s, flags);
out_uint8s(s, 16); /* reserved2 */ out_uint8s(s, 16); /* reserved2 */
/* file time */ /* file time */
/* 100-nanoseconds intervals since 1 January 1601 */ /* 100-nanoseconds intervals since 1 January 1601 */
//out_uint32_le(s, 0x2c305d08); /* 25 October 2009, 21:17 */ //out_uint32_le(s, 0x2c305d08); /* 25 October 2009, 21:17 */
//out_uint32_le(s, 0x01ca55f3); //out_uint32_le(s, 0x01ca55f3);
ui32 = g_files[index].time & 0xffffffff; ui32 = cfi->time & 0xffffffff;
out_uint32_le(s, ui32); out_uint32_le(s, ui32);
ui32 = g_files[index].time >> 32; ui32 = cfi->time >> 32;
out_uint32_le(s, ui32); out_uint32_le(s, ui32);
/* file size */ /* file size */
out_uint32_le(s, 0); out_uint32_le(s, 0);
out_uint32_le(s, g_files[index].size); out_uint32_le(s, cfi->size);
//g_writeln("jay size %d", g_files[index].size); g_snprintf(fn, 255, "%s", cfi->filename);
g_snprintf(fn, 255, "%s", g_files[index].filename);
clipboard_out_unicode(s, fn, 256); clipboard_out_unicode(s, fn, 256);
out_uint8s(s, 8); /* pad */ out_uint8s(s, 8); /* pad */
} }
out_uint32_le(s, 0); out_uint32_le(s, 0);
s_mark_end(s); s_mark_end(s);
size = (int)(s->end - s->data); size = (int)(s->end - s->data);
//g_hexdump(s->data, size);
rv = send_channel_data(g_cliprdr_chan_id, s->data, size); rv = send_channel_data(g_cliprdr_chan_id, s->data, size);
free_stream(s); free_stream(s);
return rv; return rv;
@ -315,8 +315,20 @@ clipboard_send_file_size(int streamId, int lindex)
int size; int size;
int rv; int rv;
int file_size; int file_size;
struct cb_file_info *cfi;
file_size = g_files[lindex].size; if (g_files_list == 0)
{
LLOGLN(10, ("clipboard_send_file_size: error g_files_list is nil"));
return 1;
}
cfi = (struct cb_file_info *)list_get_item(g_files_list, lindex);
if (cfi == 0)
{
LLOGLN(10, ("clipboard_send_file_size: error cfi is nil"));
return 1;
}
file_size = cfi->size;
LLOGLN(10, ("clipboard_send_file_size: streamId %d file_size %d", LLOGLN(10, ("clipboard_send_file_size: streamId %d file_size %d",
streamId, file_size)); streamId, file_size));
make_stream(s); make_stream(s);
@ -326,7 +338,6 @@ clipboard_send_file_size(int streamId, int lindex)
out_uint32_le(s, 12); out_uint32_le(s, 12);
out_uint32_le(s, streamId); out_uint32_le(s, streamId);
out_uint32_le(s, file_size); out_uint32_le(s, file_size);
g_writeln("file_size %d", file_size);
out_uint32_le(s, 0); out_uint32_le(s, 0);
out_uint32_le(s, 0); out_uint32_le(s, 0);
s_mark_end(s); s_mark_end(s);
@ -344,9 +355,7 @@ clipboard_request_file_size(int stream_id, int lindex)
struct stream *s; struct stream *s;
int size; int size;
int rv; int rv;
int file_size;
file_size = g_files[lindex].size;
LLOGLN(10, ("clipboard_request_file_size:")); LLOGLN(10, ("clipboard_request_file_size:"));
if (g_file_request_sent_type != 0) if (g_file_request_sent_type != 0)
{ {
@ -385,12 +394,23 @@ clipboard_send_file_data(int streamId, int lindex,
int rv; int rv;
int fd; int fd;
char full_fn[256]; char full_fn[256];
struct cb_file_info *cfi;
if (g_files_list == 0)
{
LLOGLN(10, ("clipboard_send_file_data: error g_files_list is nil"));
return 1;
}
cfi = (struct cb_file_info *)list_get_item(g_files_list, lindex);
if (cfi == 0)
{
LLOGLN(10, ("clipboard_send_file_data: error cfi is nil"));
return 1;
}
LLOGLN(10, ("clipboard_send_file_data: streamId %d lindex %d " LLOGLN(10, ("clipboard_send_file_data: streamId %d lindex %d "
"nPositionLow %d cbRequested %d", streamId, lindex, "nPositionLow %d cbRequested %d", streamId, lindex,
nPositionLow, cbRequested)); nPositionLow, cbRequested));
g_snprintf(full_fn, 255, "%s/%s", g_files[lindex].pathname, g_snprintf(full_fn, 255, "%s/%s", cfi->pathname, cfi->filename);
g_files[lindex].filename);
fd = g_file_open_ex(full_fn, 1, 0, 0, 0); fd = g_file_open_ex(full_fn, 1, 0, 0, 0);
if (fd == -1) if (fd == -1)
{ {
@ -401,9 +421,7 @@ clipboard_send_file_data(int streamId, int lindex,
g_file_seek(fd, nPositionLow); g_file_seek(fd, nPositionLow);
make_stream(s); make_stream(s);
init_stream(s, cbRequested + 64); init_stream(s, cbRequested + 64);
//g_memset(s->data + 12, 26, cbRequested);
size = g_file_read(fd, s->data + 12, cbRequested); size = g_file_read(fd, s->data + 12, cbRequested);
//g_writeln("size %d", size);
if (size < 1) if (size < 1)
{ {
LLOGLN(10, ("clipboard_send_file_data: read error, want %d got %d", LLOGLN(10, ("clipboard_send_file_data: read error, want %d got %d",
@ -435,9 +453,7 @@ clipboard_request_file_data(int stream_id, int lindex, int offset,
struct stream *s; struct stream *s;
int size; int size;
int rv; int rv;
int file_size;
file_size = g_files[lindex].size;
LLOGLN(10, ("clipboard_request_file_data:")); LLOGLN(10, ("clipboard_request_file_data:"));
if (g_file_request_sent_type != 0) if (g_file_request_sent_type != 0)
{ {
@ -467,6 +483,7 @@ clipboard_request_file_data(int stream_id, int lindex, int offset,
/*****************************************************************************/ /*****************************************************************************/
/* client is asking from info about a file */
int APP_CC int APP_CC
clipboard_process_file_request(struct stream *s, int clip_msg_status, clipboard_process_file_request(struct stream *s, int clip_msg_status,
int clip_msg_len) int clip_msg_len)
@ -508,7 +525,6 @@ clipboard_process_file_response(struct stream *s, int clip_msg_status,
{ {
int streamId; int streamId;
int file_size; int file_size;
char *data;
LLOGLN(0, ("clipboard_process_file_response:")); LLOGLN(0, ("clipboard_process_file_response:"));
if (g_file_request_sent_type == CB_FILECONTENTS_SIZE) if (g_file_request_sent_type == CB_FILECONTENTS_SIZE)