Commit Graph

667 Commits

Author SHA1 Message Date
Adam Potolsky ad86041433 Added code to test for and error out of max retry condition #4650 2015-05-20 14:27:25 -07:00
Adam Potolsky 1af9d58a9b Changed conditional to match coding standard #4650 2015-05-20 14:14:30 -07:00
Adam Potolsky 81a70135bd Added concept of a max retry count to SecureSocket class #4650 2015-05-20 13:50:18 -07:00
Adam Potolsky 994a9433fe Converting retry to a counter #4650 2015-05-20 12:08:25 -07:00
Xinyu Hou 3e9fc89d96 Modified server to use correct clipboard format #4601 2015-05-20 19:54:56 +01:00
Xinyu Hou 490667e21b Used StreamChunker to send clipboard in chunks #4601 2015-05-20 19:54:17 +01:00
Xinyu Hou cf5347c8f6 Sent clipboard on a thread #4601 2015-05-20 19:53:30 +01:00
Xinyu Hou 49ac320f97 Refactored clipboard event into ClipboardEvent #4601 2015-05-20 19:09:54 +01:00
Nick Bolton 950219b39e Fixed init order warning on Mac #4624 2015-05-20 17:51:52 +01:00
Nick Bolton 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
Nick Bolton 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
Nick Bolton f1af62927e Stopped Unix plugin loader from throwing #4661
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
Jerry (Xinyu Hou) a6dfbbe021 Validated received clipboard data size #4601 2015-05-19 14:28:38 -07:00
Jerry (Xinyu Hou) 2c74a7f5c1 Added stringToSizeType and its unittest #4601 2015-05-19 14:23:43 -07:00
Jerry (Xinyu Hou) c032091dd5 Added send clipboard finish log #4601 2015-05-19 13:51:13 -07:00
Jerry (Xinyu Hou) 00ceda55dc Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-19 11:37:45 -07:00
Jerry (Xinyu Hou) eaff6f50f8 Added sending clipboard chunks handling #4601 2015-05-19 10:54:02 -07:00
Jerry (Xinyu Hou) 6e7b3d87c5 Added changes for StreamChunker that is left from last commit #4601 2015-05-19 09:37:15 -07:00
Jerry (Xinyu Hou) c674642181 Used StreamChunker for clipboard and file transfer #4601
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
Nick Bolton 11a7d2c4c2 Stopped Windows plugin loader from throwing #4661
System error message hidden with 'SetErrorMode(SEM_FAILCRITICALERRORS)'
2015-05-19 14:40:33 +01:00
Nick Bolton 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
Nick Bolton 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
Jerry (Xinyu Hou) 70be9cd97f Refactored intToString #4601 2015-05-18 11:27:54 -07:00
Jerry (Xinyu Hou) af73e8280d Increased protocol version number to 1.6 #4601 2015-05-18 11:25:58 -07:00
Jerry (Xinyu Hou) 30f96b9fbb Renamed FileChunker to StreamChunker #4601 2015-05-18 10:17:22 -07:00
Nick Bolton 9f577ca4f3 Added rate limiting to IPC logging #4624 2015-05-18 18:06:58 +01:00
Nick Bolton b27b236c07 Disabled failing IPC tests for Mac #4651 2015-05-18 16:39:54 +01:00
Nick Bolton 984c5885f7 Fixed Mac build by hacking out mutex close #4651 2015-05-18 16:09:09 +01:00
Jerry (Xinyu Hou) 4c36c08099 Send clipboard data in a thread #4601 2015-05-16 00:06:38 +01:00
Jerry (Xinyu Hou) 44089d55e8 Send clipboard data in small chunks without using thread #4601 2015-05-15 22:28:43 +01:00
Nick Bolton 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
Nick Bolton aac59fbf7e File missing from last commit #4651 2015-05-15 14:44:25 +01:00
Nick Bolton 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
Jerry (Xinyu Hou) 08aee6cba7 Fixed cast error from pointer to small type on Unix #4601 2015-05-14 14:39:03 -07:00
Jerry (Xinyu Hou) 220b6befab Used a thread to send clipboard data #4601 2015-05-14 13:51:21 -07:00
Nick Bolton 134a15ea8d Modified IpcServer to be mockable #4651
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
Adam Potolsky 8c82996fc4 Merge pull request #4608 from legonigel/master
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07:00
XinyuHou 1c5ade982e Merge branch 'build_using_openssl_binaries' 2015-05-07 10:26:59 +01:00
Nigel Armstrong 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
XinyuHou be1769e4a5 Fixed Mac crashes instantly on syntool segfault #4581 2015-05-06 16:36:49 +01:00
XinyuHou 68edff43cd Merge branch 'pr-jpmcmu-macosx-sticky-key-fix' 2015-05-06 13:20:54 +01:00
XinyuHou c168721d2f Added deprecated args handling #4570 2015-05-06 11:57:42 +01:00
Adam Potolsky c3f003bf5b Adding new binary installer locations to make files #4587 2015-05-01 16:56:45 -07:00
Adam Potolsky a88bf3d3f0 Merge branch 'master' of https://github.com/synergy/synergy into build_using_openssl_binaries 2015-04-30 09:31:55 -07:00
XinyuHou 4af987e8de Made secure socket logging more user friendly #4558 2015-04-29 13:25:01 +01:00
Adam Potolsky e8b4017960 Changing ns plugin to use new binaries instead of older source directory. #4587 2015-04-28 11:55:59 -07:00
XinyuHou 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
XinyuHou fb6186304b Dropped SSLv3 support #4567 2015-04-23 13:02:42 +01:00
XinyuHou a7848d6cd2 Made comment more clear #4567 2015-04-23 13:02:42 +01:00
jpmcmu 8cd256a0b2 Removed stray character. 2015-04-23 07:04:29 -04:00
jpmcmu 9978a85a4f Added modifier flags to mouse events as a fix for sticky keys. 2015-04-22 19:33:25 -04:00
XinyuHou 018480412a Stopped retry when fatal error happened in secure socket #4553 2015-04-21 16:54:49 +01:00
Xinyu Hou 423d698436 Fixed secure socket using old trusted fingerprint path #4525 2015-04-21 16:46:05 +01:00
Nick Bolton a894615ca7 Fixed ns plugin using old certificate path #4525 2015-04-20 19:08:03 +01:00
XinyuHou cf6a6bcd48 Removed dead code #4527 2015-04-20 14:57:59 +01:00
Xinyu Hou e6e3eae0a9 Disabled reconnect after fingerprint failed #4527 2015-04-20 14:43:39 +01:00
XinyuHou 586a893201 Made retry secure write/read use the exactly last parameters #4539 2015-04-17 14:01:35 +01:00
XinyuHou 7ab1081b3f Fixed server crash caused by double delete a socket #4535 2015-04-16 11:55:05 +01:00
Nick Bolton 7c6561b3da Fixed #4528 - invalid/misleading log line 2015-04-15 15:17:30 +01:00
Nick Bolton 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
Nick Bolton 407f92e9d4 Removed --certificate-fingerprint argument #4522
Used profile dir for fingerprint file path instead
2015-04-15 14:16:28 +01:00
Xinyu Hou e405ec25e3 Always log out server fingerprint #4522 2015-04-15 13:25:18 +01:00
Xinyu Hou 52d9b1beed Logged out new fingerprint when not match #4522 2015-04-15 13:06:49 +01:00
Xinyu Hou 1e2b822226 Removed unused variable 2015-04-14 17:52:24 +01:00
XinyuHou fa1ea0022b Fixed code style 2015-04-14 17:52:15 +01:00
XinyuHou f60e98c8cd Fixed error from merge 2015-04-14 17:52:08 +01:00
XinyuHou 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
XinyuHou 28eb85660f Fixed error from merge 2015-04-14 17:51:41 +01:00
XinyuHou 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
Xinyu Hou 39e183da3e Refactored string operations
Conflicts:
	src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
XinyuHou 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
XinyuHou b24eb2b724 Removed test string #4522 2015-04-14 17:50:36 +01:00
XinyuHou 71dc472a64 Fixed code style 2015-04-14 17:49:56 +01:00
XinyuHou b8ba37b4f4 Made callback function global #4522 2015-04-14 17:49:33 +01:00
Xinyu Hou 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
James McMullan 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
Nick Bolton 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
Nick Bolton 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
Nick Bolton 32323bc0d1 Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
This reverts commit b5effc0591, reversing
changes made to 297100c88a.
2015-03-21 11:36:38 +00:00
Nick Bolton b5effc0591 Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix 2015-03-21 11:08:53 +00:00
legonigel 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
Nick Bolton 702d79570d Merge pull request #4414 from JoshMcCullough/4389
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-09 10:55:43 +00:00
Josh McCullough 4ac8f61a54 Fixed #4389 - removed unused include from platform/MSWindowsScreen. 2015-03-06 18:10:39 -05:00
Nick Bolton 2feb916f2f Unfucked --enable-drag-drop arg parse #4168 2015-03-04 15:10:03 +00:00
Nick Bolton 3364d38498 Removed unused retry variables #4313 2015-03-04 14:07:43 +00:00
Nick Bolton b4a1c3627f Improved SSL error handling for accept/connect socket #4313 2015-03-04 13:59:53 +00:00
Nick Bolton 501dc6c886 More user-friendly SSL errors, and rate limited failure #4313 2015-03-04 13:42:19 +00:00
Nick Bolton 9cdff4a910 Removed throw from checkResult (causes client to freeze) #4313 2015-03-04 12:26:54 +00:00
Nick Bolton 87a81adeb4 Improved SLL error messages and throw on cert error #4313 2015-03-04 12:15:56 +00:00
Nick Bolton 55de0746dc Copy all plugin files to bin dir (including symbols) #4168 2015-03-04 12:03:38 +00:00
Nick Bolton 719e8f6b56 Revert "More robust secure socket error handling #4313"
This reverts commit 40fa58de8c.
2015-03-04 11:43:52 +00:00
Nick Bolton 1c2576b8d7 Revert "Rephrased "crypto disabled" log, changed to error #4313"
This reverts commit a6b5c872f5.
2015-03-04 11:43:45 +00:00
Nick Bolton 6ef41522b7 Revert "Fixed: Exception was not thrown on secure accept/connect #4313"
This reverts commit c5ed03a8a0.
2015-03-04 11:43:42 +00:00
Nick Bolton cfd21216cd Fixed: Plugins dir may change depending on user #4168 2015-03-04 11:15:07 +00:00
Nick Bolton c5ed03a8a0 Fixed: Exception was not thrown on secure accept/connect #4313 2015-03-04 10:14:21 +00:00
Nick Bolton a6b5c872f5 Rephrased "crypto disabled" log, changed to error #4313 2015-03-04 09:00:01 +00:00
Nick Bolton 40fa58de8c More robust secure socket error handling #4313 2015-03-03 19:21:14 +00:00
Nick Bolton 6e7b9491d4 Fixed: Incorrect log level used #4168 2015-02-26 16:44:15 +00:00
Nick Bolton dd57a93345 Added OpenSSL DLLs to Windows installer #4313
libeay32.dll
ssleay32.dll
2015-02-26 00:04:17 +00:00
Nick Bolton bcf1a1c4d4 Added extra logging to plugin loaders #4168 2015-02-26 00:03:24 +00:00
Nick Bolton eb1083ec45 Fixed: Missing 'else if' on arg parsing #4168 2015-02-25 17:44:17 +00:00
Nick Bolton a1bfddeb5b Changed plugin manager to use installed arch #4168
Using the processor arch to figure out which plugin to downloa is not
the best idea, since a user could install 32-bit Synergy on 64-bit
Windows.
2015-02-25 17:43:48 +00:00
XinyuHou 226f2c966a assigned arch static instance instead of create a new one #4313 2015-02-13 15:58:54 +00:00
Xinyu Hou 4014176d8e Revert "created new instance of arch in plugin #4313"
This reverts commit 8e4f758cb1.
2015-02-13 14:26:03 +00:00
Xinyu Hou 9f1255d986 Revert "did not pass arch into plugins #4313"
This reverts commit 0f686ff308.
2015-02-13 14:25:29 +00:00
XinyuHou 0f686ff308 did not pass arch into plugins #4313 2015-02-13 12:42:23 +00:00
XinyuHou 8e4f758cb1 created new instance of arch in plugin #4313 2015-02-13 12:35:12 +00:00
XinyuHou 4cd20d97ea changed profile directory on mac #4168 2015-02-12 16:52:34 +00:00
XinyuHou c4c0fc8a08 added enable crypto argument to synergys/c #4313 2015-02-12 15:50:08 +00:00
XinyuHou bbcca144f5 hacked avoid syntool sigsegv on linux #4168 2015-02-11 17:32:18 +00:00
XinyuHou b9c5eb2e6f added certificate generate #4168 2015-02-11 17:28:56 +00:00
XinyuHou 80343c41eb deleted old home brew crypto #4313 2015-02-11 11:12:54 +00:00
XinyuHou 4fcec1d217 limited ns pluging to Mac 10.8 and above #4168 2015-02-10 16:20:49 +00:00
XinyuHou 7d5df54bd0 fixed copy command for libns on Linux #4168 2015-02-10 13:07:52 +00:00
XinyuHou 31440b1a8a added const cast #4168 2015-02-10 12:22:30 +00:00
XinyuHou 98716f4e78 fixed compile error on ubuntu64 #4168 2015-02-10 12:13:59 +00:00
XinyuHou 3c4b6163e3 Merge remote-tracking branch 'origin/jerry-sandbox' 2015-02-10 10:28:45 +00:00
XinyuHou b178d33d62 added plugin downloading from servere #4168 2015-02-09 15:37:47 +00:00
XinyuHou 05e6cb6254 queried plugin list from server #4168 2015-02-06 10:39:58 +00:00
XinyuHou aa46fe91a7 added activate page in wizard #4168 2015-02-05 14:17:34 +00:00
XinyuHou 097f4c4c1f Revert "added login window #4168"
This reverts commit ccc5834757.
2015-02-05 11:44:33 +00:00
XinyuHou 5f33a21878 deleted secure socket when close client time out #4313 2015-02-02 16:06:51 +00:00
XinyuHou 3aa6bed669 handled SSL connect failed on client side #4313 2015-02-02 15:33:40 +00:00
XinyuHou 10e6b5ad63 removed client connection when SSL handshake failed #4313 2015-02-02 14:18:34 +00:00
XinyuHou ccc5834757 added login window #4168 2015-01-30 16:04:27 +00:00
XinyuHou ad230d46e6 handled secure socket exception #4313 2015-01-29 16:16:45 +00:00
XinyuHou 767802f111 removed loop accept and connect and added more debug info #4313 2015-01-29 15:40:30 +00:00
XinyuHou d15c99f41d rearranged the deletion orders of clientlistener and server #4313 2015-01-28 17:34:19 +00:00
XinyuHou 4e42b9fdbd fixed memory leak and validate ssl #4313 2015-01-28 17:33:10 +00:00
XinyuHou 622e40e5d7 managed secure socket allocation and deallocation #4313 2015-01-28 13:07:03 +00:00
XinyuHou d80aa7c938 resolve #4337 removed IStreamFilterFactory dead code 2015-01-27 11:33:06 +00:00
XinyuHou a53dae9be3 added assersions before lib func invoking and adjust log level #4313 2015-01-27 11:04:23 +00:00
XinyuHou 85813fd49b added plugin unload and cleanup #4313 2015-01-27 10:42:10 +00:00
XinyuHou 10cddb97a8 fixed misused read and write #4313 2015-01-26 13:23:11 +00:00
XinyuHou 06253c965b resolve #4328 by moving plugin into lib folder 2015-01-20 16:18:51 +00:00
XinyuHou a98c4bd02a made init function signature consistent #4313 2015-01-20 16:00:15 +00:00
Xinyu Hou 141b778477 refactored SecureSocket to use interface #4313 2015-01-14 17:25:53 +00:00
XinyuHou be2b87fd39 fixed code style 2015-01-12 10:51:16 +00:00
XinyuHou f973d1498d dropped prefix C 2015-01-12 10:33:29 +00:00
XinyuHou 7bff958422 added pluging loader for unix #4313 2015-01-09 13:47:35 +00:00
XinyuHou 1d7eb3f5cb updated pluging loader for Windows #4313 2015-01-09 13:46:35 +00:00
XinyuHou de8fe7e2a5 fixed compiler cast warning in drag info class 2015-01-06 14:51:37 +00:00
the-wes 5703a41489 Update Server.cpp
clarified "cursor is locked" messages, moved the "scroll lock is on upon startup" message to NOTE level instead of DEBUG.
2014-12-30 13:33:21 -08:00
the-wes d62c4a842b Update App.h
update --help output.
2014-12-16 18:04:00 -08:00
the-wes a99bea9d3b clarify protocol error message 2014-12-05 16:59:39 -08:00
James McMullan 56b54da915 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.
2014-12-04 15:15:38 -05:00
Xinyu Hou db9f7974ed Fixed #4249 by add retain count for extension string 2014-12-02 12:36:01 +00:00
Xinyu Hou c560eabeb2 Fixed close null mutex and condvar 2014-11-27 10:52:08 +00:00
Xinyu Hou e71e7e1cd3 Catched exception while getting active desktop name 2014-11-27 10:51:58 +00:00
Vasily Galkin 06df954366 fix removing jobs for closed sockets from m_socketJobs (patch by Brian Vincent from synergy issue tracker #2866) 2014-11-14 18:29:28 +04:00
Xinyu Hou 9fd11da578 Drop C prefix on Windows 2014-11-12 11:44:29 +00:00
Xinyu Hou e5e0a3b653 Drop C prefix on Linux 2014-11-12 11:28:41 +00:00
Xinyu Hou 67377109f3 Moved Screen class into synergy namespace 2014-11-11 17:45:24 +00:00
Xinyu Hou a4843c4947 Fixed "c" prefix compile error on Mac 10.10 2014-11-11 14:58:30 +00:00
Xinyu Hou 1aaa55163c Fixed "c" prefix compile error on Windows 2014-11-11 14:50:09 +00:00
Nick Bolton 41d6080028 changed company name in copyright notice 2014-11-11 13:52:03 +00:00
Nick Bolton e8e156f0e2 dropped "c" prefix from class names 2014-11-11 13:51:47 +00:00
Xinyu Hou 37be6ec45f Merge pull request #4160 from cribe78/cribe-pullrequest#4055
Fixed: Shift keys are not sent to clients #4055
2014-11-06 15:39:30 +00:00
Xinyu Hou d347cbd45f Merge branch 'pdecat-master' 2014-11-05 10:25:31 +00:00
chris 65fc59eeae clean up changes for pull request 2014-11-04 12:17:30 -05:00
chris 93d864ad6f clean up changes for pull request 2014-11-04 12:16:58 -05:00
chris 8024aa9ab1 Working fix for #4055 (client shift key problem) in place 2014-11-04 12:06:30 -05:00
Xinyu Hou d2191b6b93 Auto elevate for Windows UAC and screen lock #4130 2014-10-27 16:39:18 +00:00
Xinyu Hou 4d3fd14ada Merge branch 'caramis-master' 2014-10-27 14:46:54 +00:00
Xinyu Hou 6756296d85 Made daemon take full responsibility for logging #4128 2014-10-27 14:11:43 +00:00
Xinyu Hou df29bf8e54 Merge branch 'helkanen-master' 2014-10-24 15:10:44 +01:00
Xinyu Hou 5c6eba8790 Merged argsParse to master 2014-10-23 13:21:41 +01:00
Xinyu Hou a32cb41342 Parse arg refactoring #4124
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou a71ebc78b3 Parse arg refactoring #4124
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou 943a355359 Parse arg refactoring #4124
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Xinyu Hou e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou f9f2d8e8af Parse arg refactoring #4124
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou d2814a423c Parse arg refactoring #4124
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Xinyu Hou bc772f98a6 Unable to start synergy server with "Cannot create a file when that file already exists" message #3752
Go to next iteration as soon as it fails.
2014-10-22 12:53:14 +01:00
Nick Bolton c2b3f1414b Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master 2014-10-22 12:49:16 +01:00
Jean-Philippe Andre 9e358233c3 Fix copy&paste for EFL applications
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
Nick Bolton 4a24a2117a Merge branch 'master' of https://github.com/caramis/synergy into caramis-master 2014-10-22 11:59:14 +01:00
Xinyu Hou 4aa43d6995 Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit 2014-10-22 11:40:00 +01:00
Xinyu Hou 504e41966e Carbon loop not ready within 5 sec #4002
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
SeokYeon Hwang 3a663092cf Do not throw exception if ProcessIdToSessionId() is failed.
Many security solutions forbid other program from accessing their own process. So if ProcessIdToSessionId() is failed, simply ignore it.

Signed-off-by: SeokYeon Hwang <caramis@gmail.com>
2014-10-21 19:51:28 +09:00
Jake Petroules 7dd2db25ec Add support for building with 64-bit architectures on OS X.
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:

Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.

TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.

Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-15 19:29:49 -07:00
Patrick Decat aeab72f724 Apply patch from https://github.com/synergy/synergy/issues/3749 2014-10-15 14:51:44 +02:00
jerry 7e562273d5 [no-issue]
revert to r2421
2014-09-15 15:17:07 +00:00
jerry 1805dd7900 issue #575 - Cannot build x86_64 or ppc64 on Mac OS X
applied patch by Jake Petroules
2014-09-15 13:04:43 +00:00
jerry c4dd6eb61c sticky keys fix doesn't work, may make things worse - backed out [no-issue] 2014-08-01 10:35:16 +00:00
Nick Bolton 3a6d9e82e3 added comment about protocol version [no-issue] [no-build] 2014-07-28 08:19:29 +00:00
jerry 995730a646 issue #18 - Sticky modifier/meta keys
- improved on Mac.
2014-07-02 13:25:49 +00:00
jerry 507abdcbfb issue #4072 Carbon loop not ready within 5 sec
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry 9feaa959f1 issue #4072 - Carboon loop not ready within 5 sec
issue solved
2014-06-02 11:04:09 +00:00
jerry 1dfe867c54 issue #4060 - Key stuck down on Windows server
finished solving issue.
2014-05-23 15:01:29 +00:00
jerry f87bd9e860 - checked filename's validation before sending drag info
- refactored duplicated write to drop dir code
- removed legacy member variables
- fixed code style
- fixed typo
2014-05-14 14:45:15 +00:00
jerry 935ca0b2f2 Added support for copying images (BMP) and HTML to/from the OS X clipboard - patch by Ryan Chapman 2014-05-13 12:31:05 +00:00
Nick Bolton d9f90e319e changed synergy-foss.org to synergy-project.org 2014-05-08 07:33:35 +00:00
jerry da3b77447a fixed warning on 10.6 and 10.5 2014-05-06 19:54:02 +00:00
jerry 2797e9a719 fixed compile error and added header for runtime_error 2014-05-06 19:23:40 +00:00
jerry 9621cba99e - redesigned drag information protocol
- used DragInformation to encapsulate information and helper functions.
- renamed parameters in sendDragInfo function.
2014-05-06 18:26:47 +00:00
jerry ff42afc36c made drag info function name more consistent 2014-05-01 13:56:07 +00:00
jerry f773ff3d00 refactored duplicated code in dragInfoReceived
refactored fakeDraggigFiles interface
2014-04-30 18:54:32 +00:00
jerry fd68b70878 patch by Marc:
- fixed switchNeedsAlt not working
- improved logging
2014-04-30 11:17:54 +00:00
jerry 5773ed1ceb made XBase non abstract 2014-04-23 14:15:41 +00:00
jerry b876c0daf3 fixed compile error on 10.6 and 10.5 2014-04-22 16:43:04 +00:00
jerry 5657348453 removed synwinxt 2014-04-22 11:38:09 +00:00
jerry c5e551ccae fixed name prefix in ServerApp and ClientApp.
removed testing code.
2014-04-22 10:56:30 +00:00
jerry 506cae9a63 made drag window frontmost when drag starts 2014-04-22 10:48:12 +00:00
jerry b85a9b628e used a hidden drop window to get drag filename 2014-04-22 10:33:16 +00:00
jerry 7b8cdb6b38 used really drag file extension 2014-04-17 17:25:41 +00:00
jerry de65f71312 removed left control key hack for faking drag on mac 2014-04-17 17:10:36 +00:00
jerry 8cdeafe995 fixed: compile error on mac 10.8 with makefile 2014-04-17 17:01:58 +00:00
jerry 93ebd6a9cc fixed: const type was used in queue 2014-04-17 16:49:19 +00:00
jerry 8482504b65 fixed: assigned const to non const type 2014-04-17 11:26:21 +00:00
jerry 45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton 8d2de7a9cb fixed: arch headers not included on windows 2014-04-08 16:47:06 +00:00
Nick Bolton d72aa1e975 fixed: pthread linker error 2014-04-08 16:41:48 +00:00
Nick Bolton b081fc0331 fixed: code style in OSXKeyState, released ref var 2014-03-31 16:04:17 +00:00
Nick Bolton 68557afff2 fixed: modifier keys are repeated on windows server. 2014-03-31 15:54:57 +00:00
Nick Bolton 6649887ca6 reverted r2025 2014-03-31 14:57:53 +00:00
Nick Bolton 26d0f59e65 fixed: exception getWhat usage returns garbage. 2014-03-31 13:56:41 +00:00
jerry bc160fab01 fixed broken drag and drop in 1.4.17 2014-03-25 15:08:00 +00:00
Nick Bolton 0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton 3e84372a14 fixed: missing virtual dtor for XArch* classes 2014-03-20 13:41:23 +00:00
Nick Bolton e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton f9fe1130ac Task #3964 - Make premium login error more verbose 2014-03-20 10:33:33 +00:00
Nick Bolton 44a98c6c9d fixed: XArchEval "what" returns garbage (memory deleted). 2014-03-20 10:32:40 +00:00
Nick Bolton 564b5c6e51 annotated hex values in logging 2014-03-17 19:27:29 +00:00
Nick Bolton 0563eeb467 extra logging, polling keys after modifier key fake 2014-03-17 19:02:13 +00:00
Nick Bolton 729bbeab01 cleaned up osx keystate code that handles modifiers (really weird code). 2014-03-17 18:39:27 +00:00
Nick Bolton 826cd7e60b reintroduced AXIsProcessTrusted call, shouldn't break ax stuff 2014-03-17 17:25:18 +00:00
Nick Bolton 3ddb7ef9e3 Task #3961 - Remove Windows 95 support 2014-03-17 16:30:27 +00:00
Nick Bolton 1b5cdecc60 Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
2014-03-17 14:34:13 +00:00
Nick Bolton 407378fbc5 Task #3951 - Clear filename stored in synwinxt on mouse up
- renamed some functions for file drag/drop to be more similar to existing
- improved log messages for the library loader
- removed hack that blocked .exe and .lnk files (annoying for developers)
- removed hack that always clears dragging filename (not very robust)
2014-03-17 13:10:29 +00:00
Nick Bolton f62cac6a0a code style - indentation 2014-03-17 11:16:52 +00:00
Nick Bolton a97fa1428b Task #3954 - Make "lock to screen" log message go to NOTE level instead of DEBUG 2014-03-17 11:14:56 +00:00
Nick Bolton 28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +00:00
Nick Bolton d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton bdb2ff5967 fixed: warning, size_t to UInt32 cast. 2014-03-14 18:31:06 +00:00
Nick Bolton abe108195d Task #3953 - Inherit XArch and XBase from std::exception 2014-03-14 18:30:21 +00:00
jerry 77eae25279 fixed code style in Log.cpp 2014-03-14 16:04:21 +00:00
jerry 54b14c439d removed unused variables 2014-03-14 16:03:15 +00:00
Nick Bolton 64248beb4e refactored logging for synwinxt, and added version number. 2014-03-07 19:37:52 +00:00
Nick Bolton 9b9a489efc fixed: tests not compiling on linux 2014-02-28 15:36:51 +00:00
Nick Bolton 19bcb9dfae fixed: osx compile errors from last commit 2014-02-28 13:06:25 +00:00
Nick Bolton f3d542b2c3 fixed: linux compile errors from last checkin 2014-02-28 12:55:14 +00:00
Nick Bolton 4675f29a4c code style fixes:
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
2014-02-28 12:36:45 +00:00
Nick Bolton 96d97ed467 updated copyright dates. 2014-02-28 07:59:33 +00:00
Nick Bolton 8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton 50a4f310c9 moved tools to ext - makes more sense, as it contains external libs, not tools 2014-02-26 16:52:54 +00:00
Nick Bolton 8d6a44d1b7 fixed: osx106 warnings 2014-02-26 15:53:28 +00:00
Nick Bolton 228befdc2c fixed: code was not gnuc 4.2 compatible 2014-02-25 19:10:54 +00:00
Nick Bolton a5d702c8b5 fixed: pragma usage not cross platform 2014-02-25 18:16:03 +00:00
Nick Bolton 78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton c44971b43d fixed: warnings on mac os x 2014-02-25 15:03:43 +00:00
Nick Bolton 75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
Nick Bolton cfc1aa2569 fixed: file is dragged twice by accident.
fixed: exe and lnk files dragged by accident.
fixed: "dir" used instead of "filename".
2014-02-07 18:44:45 +00:00
Nick Bolton 98f8a12425 fixed: watchdog keeps showing backoff message even if no command to run. 2014-02-07 18:04:25 +00:00
Nick Bolton af51454e98 fixed: garbage drop target on windows when elevated. 2014-02-07 18:03:56 +00:00
Nick Bolton d03b398bc1 - improved string conversion by using ms comutil.
- removed dead member variable.
- extra logging to help debug file drop on windows.
2014-02-07 17:06:26 +00:00
Nick Bolton fe40c670a4 fixed: "set" should be used instead of "update" 2014-02-07 15:55:59 +00:00
Nick Bolton 3ee4f55a61 "dir" was used by mistake instead of "filename" 2014-02-07 15:54:01 +00:00
Nick Bolton 8a8ae6c0b1 fixed: use of inc var is confusing. 2014-02-07 15:36:07 +00:00
Nick Bolton 39a2ecbd8f fixed: drag and drop error on mavericks - never create your own instance of NSApplication\! 2014-02-07 14:53:17 +00:00
Nick Bolton 88a84b6f04 fixed: drag and drop crashes windows - reintroduced empty function to stop not impl exception. 2014-02-07 14:23:17 +00:00
Nick Bolton deff54f051 fixed: accidentally nerfed drag and drop. 2014-02-07 11:30:48 +00:00
Nick Bolton f149101d25 fixed: linux client crashes on file drop, even though drag and drop is disabled 2014-02-06 18:39:12 +00:00
Nick Bolton 9c3e9aab09 removed not impl exception, not very helpful and causes crash on linux (gets called even though drag/drop not enabled). 2014-02-06 16:08:33 +00:00
Nick Bolton 456e56d5dc - fixed: windows http get exceptions stop cleanup.
- made premium auth errors more tidy.
2014-02-05 16:28:29 +00:00
Nick Bolton 5ca1c17549 native unix http get for premium auth 2014-02-05 14:29:50 +00:00
Nick Bolton 3f18c7c63f fixed: CArch.h missing from vs project. 2014-02-05 12:47:26 +00:00
Nick Bolton dfe6c3889e fixed: last patch went awry 2014-02-04 19:46:45 +00:00
Nick Bolton 7f08036ff3 native windows http get for premium auth 2014-02-04 19:41:29 +00:00
Nick Bolton b0a02fc94b fixed: ignore --enable-drag-drop includes os major 6 (vista family) 2014-01-28 17:21:49 +00:00
Nick Bolton 443e0cbc72 ignore --enable-drag-drop below vista and on linux 2014-01-28 16:50:40 +00:00
Nick Bolton a573a44842 make sure synwinxt.dll can only be loaded on vista and above 2014-01-28 16:44:01 +00:00
Nick Bolton 3d963bfbe7 possible fix for mavericks 2014-01-24 17:53:03 +00:00
jerry a610012fb4 patch by Jack Zhou and Henry Tung to fix alt tab not working on windows 8 (Issue# 3338). 2013-10-30 13:49:40 +00:00
Nick Bolton 469a263356 fixed: error when installing, The parameter is incorrect. 2013-10-22 18:07:28 +00:00
Nick Bolton 64c7a01ebb fixed: synergys crashes on exit. 2013-10-16 15:38:36 +00:00
Nick Bolton 2520bf4773 fixed: gui "start" button visible even though server/client is running. 2013-10-16 15:30:42 +00:00
Nick Bolton 658a3e3e8f - made windows gui service only (removed desktop mode).
- changed watchdog to only launch if it has a command.
2013-10-15 15:46:02 +00:00
Nick Bolton 8040f1c5a3 changed m_relauncher to m_watchdog 2013-10-15 10:04:27 +00:00
Nick Bolton d09ee887d8 renamed CMSWindowsRelauncher to CMSWindowsWatchdog 2013-10-14 17:15:03 +00:00
Nick Bolton 499cd47e63 - fixed: process should shut down when command is empty.
- fixed: when command was empty quotes ("") daemon crashed.
2013-10-14 17:10:51 +00:00
Nick Bolton 79ab428454 refactored windows service "relauncher" (process watchdog), so that it's easier to understand. 2013-10-14 16:29:02 +00:00
jerry b9016bc1ae - encapsulated Windows session
- fixed code style
2013-10-10 16:06:13 +00:00
Nick Bolton 85eae2a744 fixed: exploit, \Program.exe is launched instead of synergy binaries. 2013-10-03 14:24:58 +00:00
jerry 10b9b2e406 added null point handling for get dragging file directory. 2013-09-26 11:34:21 +00:00
jerry 952be51c8c fixed sending file twice when drag a file from Mac server to Windows client 2013-09-25 15:57:10 +00:00
jerry 6e50945bf9 created a new thread to write file to drop directory on client side 2013-09-25 14:49:04 +00:00
jerry 8301d50ab7 fixed drop target dir out of date 2013-09-25 13:11:19 +00:00
jerry 6c6b40e644 removed logging info that is used only for debug. 2013-09-25 12:45:10 +00:00
jerry fd0f5e1db2 disabled drag and drop feature if there is no --enable-drag-drop cmd arg 2013-09-25 12:37:27 +00:00
jerry e24afa5670 removed some unused include file dependencies and logging info only for debug 2013-09-25 10:50:11 +00:00
jerry 95ece5ac2c fixed Mac server keeps crashing during launch 2013-09-25 10:44:09 +00:00
jerry 4816a30db3 Feature to drag a file from Windows (client) to Mac (server):
- changed the size of the window for dragging on Mac to 3 by 3 pixels.
- on server side, use a new thread to write file to the drop directory.
2013-09-24 16:29:51 +00:00
jerry e145fef76f moved fake esc and lmb between getDropFileURL and draggingInfoSending, otherwise it would make getDropFileURl return null or fail to fake lmb up on carbon hardware layer, then can not move mouse back from client 2013-09-24 10:33:29 +00:00
jerry 57db3da6f3 faked escape key down and up then a left mouse button up in CServer when isSwitchOkay return true.
removed the assertions in CScreen so server screen can fake input event as well.
2013-09-23 15:31:34 +00:00
jerry f6ecf9322c hacked isLockedToScreen so that mouse move back from windows client to mac server after dropping a file 2013-09-18 14:32:38 +00:00
jerry 4e09b06cb0 fixed drag drop from Mac server to Windows client 2013-09-18 14:12:19 +00:00
jerry 39734374b1 renamed newCursor to newPos 2013-09-18 09:21:22 +00:00
Nick Bolton 0d65ff9a4c removed thread delete; threads are deleted automatically 2013-09-18 08:35:00 +00:00