mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,824 Commits 9 Branches 44 Tags 20 MiB
a8f357051e
Commit Graph

459 Commits

Author SHA1 Message Date
Koichiro IWAO
2a2b8bcd59 common: fix #248 TLS on FreeBSD 
According to document[1][2][3], retry when SSL_get_error returns
SSL_ERROR_WANT_READ/SSL_ERROR_WANT_WRITE.

[1] https://www.openssl.org/docs/ssl/SSL_read.html
[2] https://www.openssl.org/docs/ssl/SSL_write.html
[3] https://www.openssl.org/docs/ssl/SSL_accept.html
 2015-06-11 21:45:57 +09:00
Jay Sorg
33167a7c74 add frame acks and h264 codec mode basics 2015-03-28 18:34:25 -07:00
Koichiro IWAO
1f844b2d0e common: workaround for #146 2015-03-18 08:46:23 +00:00
Koichiro IWAO
278e957dd7 common: add experimental --enable-ipv6 option 2015-03-10 14:05:13 +09:00
Jay Sorg
ef20d9d507 add keyboard options to xrdp_client_info 2015-02-05 22:04:39 -08:00
speidy
86005c5bcc ssl_calls: fix to read certificate chains 2014-12-10 00:04:38 +02:00
Jay Sorg
d9d746ce5c common: avoid possible SSL_shutdown crash 2014-12-02 10:52:03 -08:00
Jay Sorg
cc0406dddf common: move tls calls to ssl_calls 2014-11-25 18:55:37 -08:00
Jay Sorg
5a8bf87c7f common: tls, fix for pending reads 2014-11-21 20:49:01 -08:00
Jay Sorg
6b0bbbeefa common: merge from a8 2014-11-07 22:10:59 -08:00
Jay Sorg
c0ce0821ec common: no logic change, remove spaces 2014-08-27 11:15:31 -07:00
speidy
4015f526db work on tls mode 2014-08-22 09:13:33 +03:00
Jay Sorg
75874b3f7a common: some minor changes to arch.h 2014-08-12 20:01:33 -07:00
Koichiro IWAO
dd979731c4 common: fix check for big endian arches 
Fix for: https://bugzilla.redhat.com/show_bug.cgi?id=905411
 2014-08-12 18:04:26 +09:00
Jay Sorg
8397055e8b move some hard code paths to defines in header 2014-08-06 13:21:01 -07:00
Jay Sorg
386512c0ed common: fix some warning for TLS 2014-07-31 16:46:58 -07:00
Jay Sorg
b30b74b3b3 added keyboard info to xrdp_client_info.h 2014-07-31 15:34:05 -07:00
Jay Sorg
f49ca27ea7 common: fix for list16_insert_item 2014-07-28 00:17:42 -07:00
Laxmikant Rashinkar
0311a82c0a coverity: copy into fixed sized buffer 2014-07-27 12:42:12 -07:00
Laxmikant Rashinkar
1c423dadf4 coverity: copy into fixed sized buffer 2014-07-26 16:33:36 -07:00
Laxmikant Rashinkar
56e43c4a38 Merge branch 'devel' of github.com:NeutrinoLabs/xrdp into devel 2014-07-26 13:33:44 -07:00
Laxmikant Rashinkar
27055d5762 coverity: improper use of negative value 2014-07-26 13:33:23 -07:00
speidy
0f9bd232d9 common: indent fix 2014-07-26 09:04:22 +03:00
Jay Sorg
2cb2de7277 common: log, g_ prefix for global 2014-07-25 22:42:07 -07:00
speidy
8e6b75b98f Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into devel 2014-07-26 08:20:19 +03:00
Jay Sorg
57b0495bc7 common: indent, not logic change 2014-07-25 22:24:40 -07:00
speidy
be51fb739c common: xrdp_tls, indentation fix 2014-07-26 08:19:50 +03:00
speidy
c612683119 common: trans indentation fix 2014-07-26 08:14:19 +03:00
Jay Sorg
a73e66513d common: indent, not logic change 2014-07-25 21:45:29 -07:00
Jay Sorg
9e1e6d3c3e common: indent, not logic change 2014-07-25 21:37:59 -07:00
Jay Sorg
ff8275da58 common: indent, not logic change 2014-07-25 21:33:05 -07:00
Jay Sorg
abf5549524 common: indent, not logic change 2014-07-25 21:21:48 -07:00
Jay Sorg
4bf326080d common: indent, not logic change 2014-07-25 21:18:40 -07:00
Jay Sorg
b39c68bdc4 common: fifo.c, os_call.h, don't need prefix dir 2014-07-24 22:31:47 -07:00
Jay Sorg
3b79792bcc common: add default for XRDP_LOG_PATH 2014-07-24 22:29:33 -07:00
Idan Freiberg
16929efb05 Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into 
devel

Conflicts:
	libxrdp/xrdp_sec.c
 2014-07-23 16:44:59 +03:00
Idan Freiberg
df87033489 trans: work on TLS 2014-07-23 15:37:47 +03:00
Idan Freiberg
afdf638c7b libxrdp, common: work on TLS mode 2014-07-23 15:31:45 +03:00
Laxmikant Rashinkar
a990287c46 coverity: fixed unchecked return value from library 2014-07-20 13:14:09 -07:00
Jay Sorg
1291d2dbbe work on codec mode 2014-07-19 13:25:23 -07:00
Laxmikant Rashinkar
3bb31876e7 coverity: fixed resolution leak issues 2014-07-19 11:56:00 -07:00
Idan Freiberg
f0b6c6b1d1 libxrdp: started adding TLS support 2014-07-15 18:29:40 +03:00
Idan Freiberg
9007deae6f libxrdp: added an option to enforce security layer in xrdp.ini 2014-07-09 15:33:39 +03:00
Jay Sorg
fef8cd9c97 common: increase file maxline size to 2048 2014-06-18 21:18:47 -07:00
Jay Sorg
d9b87e734b common: small fix for 32 bit color 2014-06-10 16:58:25 -07:00
Jay Sorg
09de814ff0 common: allow RSA keys bigger than 512 bit 2014-06-05 17:52:02 -07:00
Jay Sorg
8a116d3051 common: add another x86-64 define 2014-06-03 15:26:31 -07:00
Jay Sorg
05a281a3f8 common: trans UDS rights change 2014-05-15 18:04:04 -07:00
Jay Sorg
148c1f858c common: indent, no logic change to trans.h 2014-04-20 20:24:05 -07:00
Jay Sorg
1934c9ea00 sesman: more options for session lookup from Fredy Paquet 2014-04-20 00:42:19 -07:00
Jay Sorg
aa983d2b46 common: fix for clearing environment vars in BSD 2014-04-17 21:40:30 -07:00
Jay Sorg
da0d0e687a reduce the memory needed for crc16 bitmap cache lists 2014-03-15 21:59:16 -07:00
Jay Sorg
261d35eaac misc fixes for Xorg and compile 2014-03-14 12:23:12 -07:00
Laxmikant Rashinkar
963b95877a added a FIFO implementation 2014-03-12 19:43:14 -07:00
Jay Sorg
630f735a28 libxrdp: send, get, and use multi fragment max caps 2014-03-10 22:54:28 -07:00
jsorg71
1ce75182af Merge pull request #111 from speidy/fastpath 
libxrdp: Fastpath input
 2014-03-04 14:11:02 -08:00
Jay Sorg
374633e63f common: no logic change, update comments 2014-03-01 23:26:40 -08:00
speidy
1f1e803140 Merge ../../neutrinolabs/xrdp into fastpath 
Conflicts:
	libxrdp/libxrdp.c
	libxrdp/libxrdp.h
	libxrdp/xrdp_iso.c
	libxrdp/xrdp_sec.c
	libxrdp/xrdp_tcp.c
	xrdp/xrdp.ini
 2014-03-02 01:39:34 +02:00
Jay Sorg
f6fb5a32ed common: added some trans options used in fast path 2014-02-25 20:33:19 -08:00
Jay Sorg
25ad4d8a36 common: add more fips ssl calls 2014-02-23 20:40:13 -08:00
Jay Sorg
2921400083 common: check for nil in fips cleanup 2014-02-23 12:27:41 -08:00
Jay Sorg
926cd095fc common: added des3 calls for fips 2014-02-20 23:15:24 -08:00
Jay Sorg
b0a1832186 common: update client_info struct 2014-02-18 10:28:20 -08:00
speidy
80204e2536 libxrdp: work on fastpath input, added fastpath option to xrdp.ini 2014-02-11 00:28:43 +02:00
Jay Sorg
43e388b7e5 remove some warning, move gethostname to os_calls 2014-02-08 21:48:44 -08:00
Jay Sorg
4e6d57dbe5 common: some notes and compile fixes 2014-02-08 18:05:52 -08:00
speidy
cbf5d50a5c libxrdp: work on fastpath input 2014-02-09 01:42:04 +02:00
speidy
113f2696fe libxrdp: work on fastpath 2014-02-08 13:34:01 +02:00
Jay Sorg
48228cae2e common: added shm to os_calls 2014-01-28 10:38:36 -08:00
Jay Sorg
02aa39c79d added keyboard type and subtype to struct xrdp_client_info 2014-01-12 18:24:07 -08:00
Jay Sorg
ff12a1d799 added tbool 2014-01-10 21:55:15 -08:00
Jay Sorg
3c218ad3f2 common: try to send data in trans_write_copy 2013-12-04 15:27:49 -08:00
Jay Sorg
1deac46fdc common: add trans_get_wait_objs_rw to header 2013-12-04 15:26:23 -08:00
Jay Sorg
f221258610 common: add unknown arch check 2013-11-20 22:28:47 -08:00
Jay Sorg
4f45b4c065 added define for common types 2013-11-08 11:21:23 -08:00
speidy
92e876ea42 libxrdp: add monitorCount to client_info struct 2013-11-05 21:36:18 +02:00
speidy
0d2a4ce195 common: fix conflict 2013-10-30 19:47:26 +02:00
speidy
8cc619c223 libxrdp: work on multimon 2013-10-30 19:41:59 +02:00
Jay Sorg
9d8d31d02a common: restore xrdp_client_info order 2013-10-17 21:03:21 -07:00
Jay Sorg
5adbf2d32b libxrdp: some ISO_PDU_CR changes 2013-10-09 18:23:21 -07:00
Jay Sorg
086481395c Merge branch 'multimon' of git://github.com/speidy/xrdp into speidy-multimon 
Conflicts:
	common/xrdp_client_info.h
	libxrdp/xrdp_iso.c
	libxrdp/xrdp_sec.c
 2013-10-09 14:15:50 -07:00
Jay Sorg
25369460a1 log client ip with pid, etc 2013-10-02 16:27:12 -07:00
Jay Sorg
7176f14647 added options to set tcp send and recv buffer sizes 2013-10-02 12:52:35 -07:00
Jay Sorg
b598e258a4 add pid logging 2013-10-01 22:42:12 -07:00
Jay Sorg
c1b7cbd657 merges from authentic8 2013-09-26 11:28:07 -07:00
Jay Sorg
fc31ae1f48 trans: reset p when adding to trans list 2013-09-23 19:17:50 -07:00
Jay Sorg
3b743f64eb chansrv: deadlock, add trans copy func 2013-09-23 18:08:22 -07:00
Jay Sorg
dfd78c722b chansrv: fix for deadlock 2013-09-23 12:16:52 -07:00
speidy
2b0524ad7e libxrdp: work on RDP negotiation 2013-09-20 00:06:04 +03:00
Jay Sorg
f75b9143e2 VUL: make sure cache entries are in range 2013-09-10 16:18:21 -07:00
Jay Sorg
39ed446e15 VUL: fix some possible buffer overruns 2013-09-10 16:00:30 -07:00
Jay Sorg
3acea31439 common: added g_signal_segfault to header 2013-09-09 15:20:49 -07:00
Jay Sorg
68224550da common: update a copyright year 2013-09-09 15:20:01 -07:00
Laxmikant Rashinkar
ece8f1fb47 gracefully handle segfaults in chansrv code 2013-09-03 19:44:20 -07:00
Jay Sorg
1a616a1b46 move text2bool to os_calls 2013-08-24 22:41:44 -07:00
Jim Grandy
b7b3d9ef28 Hand-apply patches (misc) from Authentic8: b18667d 6d22ada 95d93a3 433b49c b96f85f 8c32c46 f87f6b3 c93cce0 26ce9ce 2013-08-22 12:56:51 -07:00
Jim Grandy
981741f55c Hand-apply patch (compositing) from Authentic8: 5d5e470 81c9c29 b0c2c10 27d8a01 a96a217 e512090 a9a6762 9c02bfa bd26fcc c0d29d9 676dd35 3b26737 2013-08-22 12:54:10 -07:00
Jim Grandy
1ae9a7f2b6 Hand-apply patches (drawing configuration) from Authentic8 branch: 34b92df f994298 38e2def 2013-08-22 12:49:41 -07:00
Jay Sorg
f17692adaa added out_uint64_le 2013-08-19 10:47:26 -07:00
Jay Sorg
e602a28d5c common: transport aware when app is terminating 2013-08-17 13:32:53 -07:00
Jay Sorg
6c07ee0ba3 added in_uint64_le 2013-08-05 20:14:20 -07:00
Laxmikant Rashinkar
474d17d556 xrdp: added support for forcing credentials on command line 2013-08-03 15:47:26 -07:00
Jay Sorg
fad70062d6 common: no logic change 2013-07-19 11:10:55 -07:00
speidy
a8e5b3fee5 libxrdp: work on multi-mon support 2013-07-15 10:13:03 +03:00
Jay Sorg
14a4ac5a79 libxrdp: started adding fastpath support 2013-07-09 21:34:20 -07:00
Laxmikant Rashinkar
78498f6682 Merge branch 'master' of github.com:neutrinolabs/xrdp 2013-06-08 18:44:34 -07:00
Laxmikant Rashinkar
6ad1d7f78d folder redirection: fixed language issues 2013-06-08 18:44:21 -07:00
Jay Sorg
c6fa03102f copyright year update 2013-06-08 10:51:53 -07:00
Jay Sorg
42329bda00 adding xrdp.ini option to turn off new cursors 2013-06-07 23:43:58 -07:00
Jay Sorg
d4d6a65adb merge from pmhahn 2013-05-29 00:11:14 -07:00
Laxmikant Rashinkar
89b7cd269e smartcard: developer checkin for smartcard support 2013-05-15 17:06:05 -07:00
Jay Sorg
cd0a8721d1 disable ipv6 for now 2013-05-06 17:45:30 -07:00
Jay Sorg
64fabbad68 got neutrinordp module building 2013-05-03 02:07:02 -07:00
Jay Sorg
19a9ed47dc xrdp: use full path for loading xrdp modules 2013-05-01 22:26:34 -07:00
Jay Sorg
8acdc403e3 common: fix for when [] is in comment 2013-04-25 00:19:14 -07:00
Jay Sorg
2ed8b31a11 ipv6 2013-04-04 01:31:51 -07:00
Jay Sorg
a1ca415615 ipv6 2013-04-03 23:06:40 -07:00
Jay Sorg
d9c0af1e78 ipv6 2013-04-03 23:06:08 -07:00
Jay Sorg
54463affaf autodetect ipv6 2013-04-03 00:54:52 -07:00
Jay Sorg
8b71f48f7b adding ipv6 support 2013-04-03 00:16:52 -07:00
Jay Sorg
cae3b1b0f1 ipv6 started pushing bits 2013-04-02 02:08:10 -07:00
Jay Sorg
b107414b54 sync client_info struct with A8 2013-03-26 12:40:22 -07:00
Jay Sorg
494150f1a9 work on new(color) cursors 2013-03-12 22:50:10 -07:00
Jay Sorg
a47a3cee1a libxrdp: started adding new(color) cursor support 2013-03-12 20:04:18 -07:00
Laxmikant Rashinkar
78d4e19258 o early checkin for drive redirection 
o basic drive redirection is working
o functions currently supported: open:
  read, write, create, get/set attribute
o requires latest NeutrinoRDP to work
o note: clipboard is broken because of the move from
        linked lists to inodes in the FUSE code
 2013-03-08 15:37:30 -08:00
ArvidNorr
fe69d2f07b Comments and debug when blocking channels added. Fix for potential vulnerability in log.c 2013-02-01 10:00:39 +01:00
ArvidNorr
72c99794ee Merge pull request #59 from ArvidNorr/morelogging 
More logging for debug and trace.
 2013-01-31 11:22:43 -08:00
ArvidNorr
fb7294ed26 small len fixes 2013-01-31 20:17:42 +01:00
ArvidNorr
9aa0cb4e61 Merge pull request #58 from ArvidNorr/pam-cont 
PAM additions mostly for a gateway situation
 2013-01-31 07:17:42 -08:00
Philipp Hahn
1a4ed6d3fd xrdp: Fix format string vulnerability 
The the string being printer contains a "%", this could crash xrdp.
 2013-01-28 11:04:28 +01:00
Philipp Hahn
397089a207 sesman: Fix dist 
Add missing header files to EXTRA_DIST.
Otherwise "make distcheck" fails.
 2013-01-28 11:04:28 +01:00
ArvidNorr
975d44e99f More logging added 2013-01-18 10:24:25 +01:00
LawrenceK
e47a9cea97 Allow for any non 0 and the string to also be true. These are the tests used elsewhere in the xrdp code. 2013-01-17 11:31:01 +00:00
ArvidNorr
a2bbbd8cc3 Display PAM error in gateway setup, use domain name as IP/DNS, changed how the socket is closed 2013-01-16 01:28:35 -08:00
Jay Sorg
eb4209e932 libxrdp: added ini settings for bulk compressor 2013-01-06 23:56:40 -08:00
LawrenceK
a52dbba1a5 Add g_strchr to os_calls 2012-12-20 07:02:41 +00:00
Jay Sorg
82a8366fc0 added getgid to os_calls 2012-10-29 20:30:48 -07:00
Jay Sorg
e07dd5afb5 added a file open funtion 2012-10-13 22:48:05 -07:00
Laxmikant Rashinkar
1123323fda o moved from GNU General Public License to Apache License, Version 2.0 
o applied new coding standards to all .c files
o moved some files around
 2012-09-19 20:51:34 -07:00
Jay Sorg
204d6bbde1 codecs: move jpeg hack to bitmap cache v3 2012-07-24 11:56:09 -07:00
Jay Sorg
6d539b8e22 user rfx for cache v3 if client supports 2012-07-23 11:12:39 -07:00
Jay Sorg
4e92468262 output error when set socket opt fails 2012-07-23 11:06:04 -07:00
Jay Sorg
e4182cde17 work on rdp codecs 2012-07-17 15:19:59 -07:00
Jay Sorg
01393af3e6 added support for bitmap cache v3 2012-07-17 12:59:03 -07:00
Jay Sorg
b211b9be91 fix a define conflict with freerdp 2012-07-17 10:05:26 -07:00
Jay Sorg
dc6be76b11 rail: proxy rail 2012-06-24 18:10:49 -07:00
Jay Sorg
7dc5a77116 common: no logic changes, code cleanup 2012-06-23 16:22:38 -07:00
ArvidNorr
d2903cd1fc Merge pull request #28 from ArvidNorr/tcp_nodelay 
Support for TCP keepalive and TCP no_delay added
 2012-06-18 00:00:05 -07:00
ArvidNorr
1011b4a256 Merge pull request #22 from ArvidNorr/moduleload 
Moduleload
 2012-06-17 23:14:40 -07:00
norrarvid
31a5dd33dd minor layout fixes 2012-06-18 08:11:26 +02:00