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
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
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
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
68edff43cd
Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'
2015-05-06 13:20:54 +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
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
fb6186304b
Dropped SSLv3 support #4567
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
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
a894615ca7
Fixed ns plugin using old certificate path #4525
2015-04-20 19:08:03 +01:00
cf6a6bcd48
Removed dead code #4527
2015-04-20 14:57:59 +01:00
e6e3eae0a9
Disabled reconnect after fingerprint failed #4527
2015-04-20 14:43:39 +01:00
586a893201
Made retry secure write/read use the exactly last parameters #4539
2015-04-17 14:01:35 +01:00
7ab1081b3f
Fixed server crash caused by double delete a socket #4535
2015-04-16 11:55:05 +01:00
7c6561b3da
Fixed #4528 - invalid/misleading log line
2015-04-15 15:17:30 +01:00
c7de2da062
Comment out unused fingerprint filename consts #4522
...
Causing compile to fail on Mac (fails on warnings)
2015-04-15 14:33:26 +01:00
407f92e9d4
Removed --certificate-fingerprint argument #4522
...
Used profile dir for fingerprint file path instead
2015-04-15 14:16:28 +01:00
e405ec25e3
Always log out server fingerprint #4522
2015-04-15 13:25:18 +01:00
52d9b1beed
Logged out new fingerprint when not match #4522
2015-04-15 13:06:49 +01:00
1e2b822226
Removed unused variable
2015-04-14 17:52:24 +01:00
fa1ea0022b
Fixed code style
2015-04-14 17:52:15 +01:00
f60e98c8cd
Fixed error from merge
2015-04-14 17:52:08 +01:00
916a4c75af
Refactored no or wrong ssl certificate error handling #4410
...
Conflicts:
src/lib/net/TCPListenSocket.cpp
src/lib/plugin/ns/SecureListenSocket.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
2015-04-14 17:52:00 +01:00
28eb85660f
Fixed error from merge
2015-04-14 17:51:41 +01:00
b4665b9cd5
Passed args into client and socket
...
Conflicts:
src/lib/client/Client.cpp
src/lib/client/Client.h
src/lib/synergy/ClientApp.cpp
src/test/integtests/net/NetworkTests.cpp
2015-04-14 17:51:31 +01:00
39e183da3e
Refactored string operations
...
Conflicts:
src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
cb0f0dd06d
Improved fingerprint verification #4522
...
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
src/lib/synergy/ClientApp.cpp
2015-04-14 17:50:49 +01:00
b24eb2b724
Removed test string #4522
2015-04-14 17:50:36 +01:00
71dc472a64
Fixed code style
2015-04-14 17:49:56 +01:00
b8ba37b4f4
Made callback function global #4522
2015-04-14 17:49:33 +01:00
5dfe4aa0b5
Added verification of server certificate fingerprint #4522
...
Conflicts:
src/lib/mt/Thread.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/synergy/ClientArgs.cpp
2015-04-14 17:46:58 +01:00
1bbd086a17
MacOSX Double / Triple Click Fix
...
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
2015-03-21 13:41:00 +00:00
ecd51d231b
Revert "Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"""
...
This reverts commit 7f721ee7b1
2015-03-21 13:38:20 +00:00
7f721ee7b1
Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix""
...
This reverts commit 32323bc0d1
2015-03-21 11:42:37 +00:00
32323bc0d1
Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
...
This reverts commit b5effc0591297100c88a
2015-03-21 11:36:38 +00:00
b5effc0591
Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix
2015-03-21 11:08:53 +00:00
447169df32
Fix #4349
...
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
2015-03-20 03:12:50 -04:00
702d79570d
Merge pull request #4414 from JoshMcCullough/4389
...
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-09 10:55:43 +00:00
4ac8f61a54
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-06 18:10:39 -05:00
2feb916f2f
Unfucked --enable-drag-drop arg parse #4168
2015-03-04 15:10:03 +00:00
3364d38498
Removed unused retry variables #4313
2015-03-04 14:07:43 +00:00
b4a1c3627f
Improved SSL error handling for accept/connect socket #4313
2015-03-04 13:59:53 +00:00
501dc6c886
More user-friendly SSL errors, and rate limited failure #4313
2015-03-04 13:42:19 +00:00
9cdff4a910
Removed throw from checkResult (causes client to freeze) #4313
2015-03-04 12:26:54 +00:00
87a81adeb4
Improved SLL error messages and throw on cert error #4313
2015-03-04 12:15:56 +00:00
55de0746dc
Copy all plugin files to bin dir (including symbols) #4168
2015-03-04 12:03:38 +00:00
719e8f6b56
Revert "More robust secure socket error handling #4313 "
...
This reverts commit 40fa58de8c
2015-03-04 11:43:52 +00:00
1c2576b8d7
Revert "Rephrased "crypto disabled" log, changed to error #4313 "
...
This reverts commit a6b5c872f5
2015-03-04 11:43:45 +00:00
6ef41522b7
Revert "Fixed: Exception was not thrown on secure accept/connect #4313 "
...
This reverts commit c5ed03a8a0
2015-03-04 11:43:42 +00:00
cfd21216cd
Fixed: Plugins dir may change depending on user #4168
2015-03-04 11:15:07 +00:00
c5ed03a8a0
Fixed: Exception was not thrown on secure accept/connect #4313
2015-03-04 10:14:21 +00:00
a6b5c872f5
Rephrased "crypto disabled" log, changed to error #4313
2015-03-04 09:00:01 +00:00
40fa58de8c
More robust secure socket error handling #4313
2015-03-03 19:21:14 +00:00
Adam Potolsky
Jerry (Xinyu Hou)
Nick Bolton
Nigel Armstrong
jpmcmu
Josh McCullough