773530506e
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 16:10:29 -07:00
35e09c46b9
Changed secureSocket routines to return a status, and modify an argument for num of bytes handled #4697
2015-05-22 16:09:59 -07:00
ff9ad5554a
Used different chunk size for SSL and non-SSL socket #4601
2015-05-22 13:30:50 -07:00
36ddc4f1c1
Fixed indentation
2015-05-22 13:10:22 -07:00
625feab104
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 12:40:24 -07:00
c1d859e35a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 11:28:39 -07:00
a81b88c730
Refactored file assemble and send code #4601
2015-05-22 11:27:57 -07:00
7b718dc586
Forgot to change linux specific variable name #4697
2015-05-22 11:17:10 -07:00
86ad2bf080
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 10:56:33 -07:00
5b3fa48902
Made socket self-aware of when it is in a fatal state #4697
...
Added code to cleanly terminate connection on fatal socket state #4697
2015-05-22 10:56:13 -07:00
1df566d241
Refactored duplicated code #4601
2015-05-21 17:50:55 -07:00
1c28444cf6
Refactored duplicated code #4601
2015-05-21 16:04:50 -07:00
342a345d1f
Fixed code style
2015-05-21 15:35:36 -07:00
257c19ecc4
Deprecated and moved clipboard functionality into new protocol #4601
2015-05-21 15:34:28 -07:00
e4f86a8934
Adding pass/fail retry logic to connection attempts #4697 #4650
2015-05-21 15:22:39 -07:00
8b49eb6595
Removed unused function #4601
2015-05-21 15:19:00 -07:00
c22e327eed
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-21 11:37:42 -07:00
0de7a08b4c
Updated wizard version to '4' to force plugin download #4529
2015-05-21 16:49:07 +01:00
18d85f1b6b
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-20 16:56:32 -07:00
68ecdc0753
Added additional logging to help debug potential problems related to performance and SSL WAIT states #4650
2015-05-20 16:54:42 -07:00
7dbe30cb61
Fixed Linux uses wrong clipboard event #4601
2015-05-20 14:43:58 -07:00
ad86041433
Added code to test for and error out of max retry condition #4650
2015-05-20 14:27:25 -07:00
1af9d58a9b
Changed conditional to match coding standard #4650
2015-05-20 14:14:30 -07:00
81a70135bd
Added concept of a max retry count to SecureSocket class #4650
2015-05-20 13:50:18 -07:00
994a9433fe
Converting retry to a counter #4650
2015-05-20 12:08:25 -07:00
3e9fc89d96
Modified server to use correct clipboard format #4601
2015-05-20 19:54:56 +01:00
490667e21b
Used StreamChunker to send clipboard in chunks #4601
2015-05-20 19:54:17 +01:00
cf5347c8f6
Sent clipboard on a thread #4601
2015-05-20 19:53:30 +01:00
49ac320f97
Refactored clipboard event into ClipboardEvent #4601
2015-05-20 19:09:54 +01:00
950219b39e
Fixed init order warning on Mac #4624
2015-05-20 17:51:52 +01:00
561204b2a7
Disabled threading on most IPC logging tests #4624
...
Threading was making it very hard to reliably run the IPC logging tests
(many timing issues), so I disabled threading for most of the tests.
2015-05-20 17:42:07 +01:00
89a977da66
Positive tests for IPC logging #4624
...
So far I had only tested what happens when the limits are exceeded.
These new tests are for when usage is within limits.
2015-05-20 16:16:22 +01:00
a710b2752b
Reintroduced sleep for really fast computers #4624
2015-05-20 16:07:09 +01:00
9636af61d6
Solution attempt for timing bugs in write_bufferRateLimit
...
It's probably better to wait until the buffer is sent, rather than
waiting until its empty. To test the output it has to be sent, but
because of timing, it may be emptied at any point.
2015-05-20 15:51:07 +01:00
f1af62927e
Stopped Unix plugin loader from throwing #4661
...
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
a6dfbbe021
Validated received clipboard data size #4601
2015-05-19 14:28:38 -07:00
2c74a7f5c1
Added stringToSizeType and its unittest #4601
2015-05-19 14:23:43 -07:00
c032091dd5
Added send clipboard finish log #4601
2015-05-19 13:51:13 -07:00
00ceda55dc
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-19 11:37:45 -07:00
eaff6f50f8
Added sending clipboard chunks handling #4601
2015-05-19 10:54:02 -07:00
6e7b3d87c5
Added changes for StreamChunker that is left from last commit #4601
2015-05-19 09:37:15 -07:00
c674642181
Used StreamChunker for clipboard and file transfer #4601
...
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
11a7d2c4c2
Stopped Windows plugin loader from throwing #4661
...
System error message hidden with 'SetErrorMode(SEM_FAILCRITICALERRORS)'
2015-05-19 14:40:33 +01:00
46527ded56
Limited Windows service log file size to 1MB #4677
...
Oversized file is renamed to .1 to keep old log files in case needed,
but the old file will eventually be overwritten on 2nd recycle
2015-05-19 14:04:02 +01:00
2cce60f672
Fixed sleep timing on IPC log rate limit unit tests #4624
...
Still a little hacky, but seems stable on my dev machine
2015-05-19 10:41:04 +01:00
efa358f917
Added comment about hacky log line #4690
...
@XinyuHou, when adding hacks, please annotate with a comment
2015-05-19 10:28:02 +01:00
70be9cd97f
Refactored intToString #4601
2015-05-18 11:27:54 -07:00
af73e8280d
Increased protocol version number to 1.6 #4601
2015-05-18 11:25:58 -07:00
62a501066f
Disabled IPC logging tests for Mac and Linux #4624
...
This is a bit hacky, but IPC logging isn't used on Mac and Linux anyway,
and we're hopefully going to remove it.
2015-05-18 18:19:43 +01:00
30f96b9fbb
Renamed FileChunker to StreamChunker #4601
2015-05-18 10:17:22 -07:00
9f577ca4f3
Added rate limiting to IPC logging #4624
2015-05-18 18:06:58 +01:00
b27b236c07
Disabled failing IPC tests for Mac #4651
2015-05-18 16:39:54 +01:00
984c5885f7
Fixed Mac build by hacking out mutex close #4651
2015-05-18 16:09:09 +01:00
4c36c08099
Send clipboard data in a thread #4601
2015-05-16 00:06:38 +01:00
44089d55e8
Send clipboard data in small chunks without using thread #4601
2015-05-15 22:28:43 +01:00
e60b3a6feb
Added truncating to IPC log buffer queue #4651
...
When the IPC log buffer is too large, the oldest log line is removed
when a new log line is added.
2015-05-15 15:04:16 +01:00
aac59fbf7e
File missing from last commit #4651
2015-05-15 14:44:25 +01:00
2e3769c7a6
Added failing test for IpcLogOutputter::write(...) #4651
...
- Changed behavior of close() to stop the buffer thread
- Fixed code style in IpcLogOutputter.cpp
- Changed MAX_SEND macro to enum
- Added Doxygen @name sections
2015-05-15 14:43:42 +01:00
08aee6cba7
Fixed cast error from pointer to small type on Unix #4601
2015-05-14 14:39:03 -07:00
220b6befab
Used a thread to send clipboard data #4601
2015-05-14 13:51:21 -07:00
134a15ea8d
Modified IpcServer to be mockable #4651
...
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
8c82996fc4
Merge pull request #4608 from legonigel/master
...
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07:00
1c5ade982e
Merge branch 'build_using_openssl_binaries'
2015-05-07 10:26:59 +01:00
d71304ee55
Modified header of every file COPYING to LICENSE
...
Modified to match the updated name of the license file
2015-05-06 22:12:44 -04:00
be1769e4a5
Fixed Mac crashes instantly on syntool segfault #4581
2015-05-06 16:36:49 +01:00
932b0f0c55
Fixed GUI doesn't start after install on Windows #4607
2015-05-06 16:19:51 +01:00
50c8f87a6a
Updated translation files
2015-05-06 15:28:19 +01:00
9e9e1362ac
Fixed typo and regenerated master ts #4596
2015-05-06 14:25:18 +01:00
02bfeff1b2
Merge pull request #4596 from joweiser/patch-1
...
Typo 'occurred' in WebClient.cpp
2015-05-06 14:00:07 +01:00
68edff43cd
Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'
2015-05-06 13:20:54 +01:00
1f0adb0d7b
Fixed warning on Linux #4570
2015-05-06 12:11:12 +01:00
c168721d2f
Added deprecated args handling #4570
2015-05-06 11:57:42 +01:00
c3f003bf5b
Adding new binary installer locations to make files #4587
2015-05-01 16:56:45 -07:00
a88bf3d3f0
Merge branch 'master' of https://github.com/synergy/synergy into build_using_openssl_binaries
2015-04-30 09:31:55 -07:00
82bb539d5e
Typo in WebClient.cpp
2015-04-29 22:18:15 +02:00
5266d94faa
Added code to fetch openssl libs from archetecture specific location #4587
2015-04-29 11:35:12 -07:00
503a6e26bf
Added variable to define location of windows binaries #4587
2015-04-29 10:27:41 -07:00
4af987e8de
Made secure socket logging more user friendly #4558
2015-04-29 13:25:01 +01:00
e8b4017960
Changing ns plugin to use new binaries instead of older source directory. #4587
2015-04-28 11:55:59 -07:00
a597596654
Merge branch 'MacOSX-Sticky-Key-Fix' of https://github.com/jpmcmu/synergy into pr-jpmcmu-macosx-sticky-key-fix
2015-04-24 12:34:08 +01:00
c7b444a762
Modified auto hide feature #4569
...
Made auto hide on startup and added an info masseage on first connection
2015-04-23 17:32:18 +01:00
fb76dee8cc
Reintroduced GUI auto-hide setting (disabled by default) #4569
2015-04-23 15:37:07 +01:00
fb6186304b
Dropped SSLv3 support #4567
2015-04-23 13:02:42 +01:00
decf7ca313
Removed unused dependency #4520
2015-04-23 13:02:42 +01:00
a7848d6cd2
Made comment more clear #4567
2015-04-23 13:02:42 +01:00
8cd256a0b2
Removed stray character.
2015-04-23 07:04:29 -04:00
9978a85a4f
Added modifier flags to mouse events as a fix for sticky keys.
2015-04-22 19:33:25 -04:00
363dc78ca8
Updated local fingerprint after wizard is finished #4557
2015-04-21 17:56:01 +01:00
018480412a
Stopped retry when fatal error happened in secure socket #4553
2015-04-21 16:54:49 +01:00
423d698436
Fixed secure socket using old trusted fingerprint path #4525
2015-04-21 16:46:05 +01:00
f56d06d95d
Disabled auto-hide feature #4390
2015-04-21 16:25:55 +01:00
d184be31b5
Fixed: SSL dir not created on Mac #4551
2015-04-21 14:48:28 +01:00
dbc5da7a48
Refactored certificate class (part 2) #4549
2015-04-21 12:55:45 +01:00
7e239c6f71
Refactored certificate class
...
Split `generateCertificate` into separtate `generateFingerprint`
function, renamed a few functions, removed some unused functions.
2015-04-20 19:26:41 +01:00
a894615ca7
Fixed ns plugin using old certificate path #4525
2015-04-20 19:08:03 +01:00
f997aea8e7
Moved SSL generate code as is into new class #4549
2015-04-20 18:51:22 +01:00
2a2d095527
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-20 16:53:34 +01:00
aa9504f43e
Changed filenames in app data directory #4525
...
- Changed `ssl` to `SSL`
- Moved pem file to `SSL`
2015-04-20 16:40:50 +01:00
97060d9698
Removed unused SSL download code #4546
2015-04-20 16:31:36 +01:00
a649a0e3df
Reduced code duplication in fingerprint logic #4548
2015-04-20 16:28:26 +01:00
Adam Potolsky
Jerry (Xinyu Hou)
Adam Potolsky
Nick Bolton
Nigel Armstrong
Johannes Weiser
jpmcmu