Commit graph

1239 commits

Author SHA1 Message Date
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
7795d68c21 Removed magic number #4712 2015-06-04 14:46:47 -07:00
Jerry (Xinyu Hou)
eb3f8aee2a Notified file transmission interrupted #4745 2015-06-04 14:43:49 -07:00
Adam Potolsky
88e5c6197d Trivial whitespace fix cause by by editor settings 2015-06-04 14:06:17 -07:00
Jerry (Xinyu Hou)
646e1b52eb Interrupted file transfer when cursor move back #4584 2015-06-04 13:09:48 -07:00
Jerry (Xinyu Hou)
e0903983ad Validated file expected size #4584 2015-06-04 10:19:36 -07:00
Jerry (Xinyu Hou)
8c64cbf54e Refactored send drag info on server #4584 2015-06-04 10:04:08 -07:00
Adam Potolsky
78f8fb45ba Fixed Installed Directory in ARCH for MacOS #4696 2015-06-04 09:58:22 -07:00
Jerry (Xinyu Hou)
ee22e688d5 Removed clipboard ignore notification #4745 2015-06-03 17:32:09 -07:00
Jerry (Xinyu Hou)
d9684d44d2 Added fake drag file list #4584 2015-06-03 16:17:26 -07:00
Jerry (Xinyu Hou)
4508e10186 Fixed IpcLogOutputterTest #4721 2015-06-03 15:23:33 -07:00
Jerry (Xinyu Hou)
7614a21aac Cleared buffer on send instead of write #4721 2015-06-03 14:45:47 -07:00
Jerry (Xinyu Hou)
c4e8dc7198 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-02 15:30:33 -07:00
Adam Potolsky
ad9cfd64af Added symbolic link creation to linux and macos #4696 2015-06-02 14:29:01 -07:00
Adam Potolsky
0061969cf2 Updating installed dir for Linux and MacOS #4696 2015-06-02 14:28:20 -07:00
Jerry (Xinyu Hou)
22e8d3d03a Fixed clipboard transmission messing up start/stop $4745 2015-06-02 13:42:27 -07:00
Jerry (Xinyu Hou)
8d0fdee5ce Added full stop for notification #4745 2015-06-02 11:18:21 -07:00
Jerry (Xinyu Hou)
f42b756b0e Added clipboard transmission failed notification #4745 2015-06-02 11:17:04 -07:00
Jerry (Xinyu Hou)
f22d9ac477 Added clipboard transmission start notification #4745 2015-06-02 11:14:28 -07:00
Jerry (Xinyu Hou)
d9921c894c Added clipboard transmission notification #4745 2015-06-02 09:48:26 -07:00
Jerry (Xinyu Hou)
ce2c797f69 Made code more readable #4745 2015-06-01 16:58:21 -07:00
Jerry (Xinyu Hou)
3d55516fdf Removed unused code #4745 2015-06-01 16:56:52 -07:00
Adam Potolsky
e784b48711 Added use of Installed Dir for finding plugin install directory #4696
Fixed issues with file path creation #4696
2015-06-01 16:50:05 -07:00
Adam Potolsky
c1158ea7f9 Removed speaker and system hard coded locations from code #4696
Removed previously commended out code that is unnecessary #4696
2015-06-01 16:48:12 -07:00
Adam Potolsky
4a7fdabd65 Added Installed Dir to PluginManager #4696 2015-06-01 16:46:33 -07:00
Adam Potolsky
5d770d4204 Added getInstallDir to Core Interface #4696 2015-06-01 16:43:57 -07:00
Adam Potolsky
98bb9b3fb3 Added getInstalledDir to ToolApp. #4696 2015-06-01 16:43:27 -07:00
Jerry (Xinyu Hou)
4533063768 Fixed compile error on Unix #4745 2015-06-01 16:04:13 -07:00
Jerry (Xinyu Hou)
bfe616eebe Added file transmission started notification for server #4745 2015-06-01 16:00:35 -07:00
Jerry (Xinyu Hou)
d1ca021002 Monitoring log to show notification and made icon change while transfering $4745 2015-06-01 15:59:59 -07:00
Xinyu Hou
5cbcd74028 Fixed using NOTE level logging on Mac #4745 2015-06-01 23:42:58 +01:00
Jerry (Xinyu Hou)
e7f358afb2 Added file transmission started, failed and complete notification #4745 2015-06-01 15:33:06 -07:00
Jerry (Xinyu Hou)
5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou)
d3a4ce1f11 Moved note into either warning or info #4745 2015-06-01 14:31:32 -07:00
Jerry (Xinyu Hou)
ecf0485e8f Removed commented out code #4745 2015-06-01 12:39:30 -07:00
Jerry (Xinyu Hou)
4a27c0b05c Added drop file notification on client #4745 2015-06-01 11:57:43 -07:00
Jerry (Xinyu Hou)
bd3a8e9429 Fixed unittest for ipcLogOutputter #4721 2015-05-29 17:48:53 -07:00
Jerry (Xinyu Hou)
97bac70fae Stop writing into and clear buffer when no GUI #4721 2015-05-29 16:55:22 -07:00
Adam Potolsky
4bf1eeb065 Removed unnecessary method and static data #4696 2015-05-29 16:47:51 -07:00
Adam Potolsky
1229974d2f Merge branch 'master' into 4696
Conflicts:
	src/gui/src/PluginManager.cpp
2015-05-29 16:39:31 -07:00
Adam Potolsky
e35fd80cef Fixed name for Mac and Linux Build #4696 2015-05-29 16:20:47 -07:00
Adam Potolsky
8d70075171 Replaces plugin download with install and copy functionality #4696 2015-05-29 15:57:21 -07:00
Jerry (Xinyu Hou)
9487db1672 Merge pull request #4722 from maximd/master
Fix issue synergy/synergy#4720
2015-05-28 16:58:44 -07:00
Jerry (Xinyu Hou)
d7063a87c8 Fixed using wrong local variable #4723 2015-05-27 10:32:13 -07:00
Jerry (Xinyu Hou)
aec52c36e6 Added timeout for waiting active destop result #4723 2015-05-27 10:18:45 -07:00
Jerry (Xinyu Hou)
3498d1bc8e Used synergy::string::sprintf instead of append #4690 2015-05-27 09:52:58 -07:00
Maxim Doucet
03fc9b5fa7 Fix issue synergy/synergy#4720 2015-05-27 18:34:47 +02:00
Jerry (Xinyu Hou)
d83cb23cc7 Reverted 8b9758 #4712 2015-05-26 17:25:18 -07:00
Jerry (Xinyu Hou)
907b02fb09 Used log system instead of stdout (part 2) #4690 2015-05-26 17:18:14 -07:00
Jerry (Xinyu Hou)
3788084e43 Merge branch 'jerry-sandbox' of https://github.com/synergy/synergy into jerry-sandbox 2015-05-26 17:13:09 -07:00
Jerry (Xinyu Hou)
f063b094ec Used log system instead of stdout #4690 2015-05-26 17:12:58 -07:00
Jerry (Xinyu Hou)
dba46707b2 Removed SSL chunk size limitation #4712 2015-05-26 13:31:15 -07:00
Nick Bolton
8b975878c2 Limited clipboard size to 1kb when SSL is enabled #4601
@XinyuHou I had no choice but to block clipboard data over 1kb in
size... anything over that and you get an access violation.
2015-05-26 15:04:04 +01:00
Nick Bolton
fd72bf17ce Reworded SSL errors to be more consistent #4650 2015-05-26 14:17:30 +01:00
Nick Bolton
42ed1c2f27 Increased ssl error rate limit from 50k to 100k #4650
@speaker This is nuts... my mac client now errors 50k times before it
eventually connects.
2015-05-26 14:14:24 +01:00
Nick Bolton
3dc3d5b309 Increased ssl error rate limit from 60 to 50000 #4650
@speaker, a 50k limit seems a bit insane, but it seems to be the only
way to get my Mac client to establish a connection :-/
2015-05-26 14:00:50 +01:00
Nick Bolton
e96cead732 Fixed wrong sprintf specifier used (%s instead of %d) #4650
My bad, I was being carless in 4aa57cfbdb
2015-05-26 12:19:13 +01:00
Nick Bolton
4aa57cfbdb Fixed code style, more consistent logging #4650 2015-05-25 20:24:29 +01:00
Nick Bolton
1cea4bb80f Fixed code style, use lower case for logging #4650 2015-05-25 20:20:12 +01:00
Nick Bolton
0fdcfe9b95 Fixed code style, prefer enums over macros #4650 2015-05-25 20:20:12 +01:00
Nick Bolton
3563217c7b Fixed Mac package platform variable name #4708 2015-05-25 19:54:34 +01:00
Nick Bolton
590d0482b3 Removed useless processor type return for Mac #4708 2015-05-25 19:54:21 +01:00
Nick Bolton
e8a43dd020 Simplified logic to detect Linux 64/32 deb/rpm #4565 2015-05-25 19:41:53 +01:00
Nick Bolton
e479f16705 Incremented default plugin version to 1.1 2015-05-25 18:59:58 +01:00
Nick Bolton
cae767735c Download specific plugin version on Mac #4708 2015-05-25 18:59:58 +01:00
Nick Bolton
14bb44f539 Comment explaining lack of 10.7 support #4695 2015-05-25 17:41:38 +01:00
Nick Bolton
25237a14b7 Revert "Allowed Mac OS X 10.7 to build ns plugin #4695"
This reverts commit a900543c1d.
2015-05-25 17:40:36 +01:00
Nick Bolton
a900543c1d Allowed Mac OS X 10.7 to build ns plugin #4695 2015-05-25 16:53:46 +01:00
Nick Bolton
b71c298163 Changed sleep time to 100ms for unit test (hack) #4651 2015-05-25 15:25:14 +01:00
Nick Bolton
18344e6b52 Copy ns plugin to debug dir when in debug mode #4704 2015-05-25 13:08:47 +01:00
Nick Bolton
f322a79760 Copy plugins to config dir on Mac #4703 2015-05-25 13:07:36 +01:00
Jerry (Xinyu Hou)
b1f2abbaae Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 16:39:33 -07:00
Xinyu Hou
fb3252efef Added a way to interrupt sending clipboard/file #4601 2015-05-23 00:34:00 +01:00
Adam Potolsky
905dbfee90 Fixed order of initializers for mac build #4697 2015-05-22 16:26:40 -07:00
Adam Potolsky
773530506e Merge branch 'master' of https://github.com/synergy/synergy 2015-05-22 16:10:29 -07:00
Adam Potolsky
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
Jerry (Xinyu Hou)
ff9ad5554a Used different chunk size for SSL and non-SSL socket #4601 2015-05-22 13:30:50 -07:00
Jerry (Xinyu Hou)
36ddc4f1c1 Fixed indentation 2015-05-22 13:10:22 -07:00
Jerry (Xinyu Hou)
625feab104 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 12:40:24 -07:00
Jerry (Xinyu Hou)
c1d859e35a Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-22 11:28:39 -07:00
Jerry (Xinyu Hou)
a81b88c730 Refactored file assemble and send code #4601 2015-05-22 11:27:57 -07:00
Adam Potolsky
7b718dc586 Forgot to change linux specific variable name #4697 2015-05-22 11:17:10 -07:00
Adam Potolsky
86ad2bf080 Merge branch 'master' of https://github.com/synergy/synergy 2015-05-22 10:56:33 -07:00
Adam Potolsky
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
Jerry (Xinyu Hou)
1df566d241 Refactored duplicated code #4601 2015-05-21 17:50:55 -07:00
Jerry (Xinyu Hou)
1c28444cf6 Refactored duplicated code #4601 2015-05-21 16:04:50 -07:00
Jerry (Xinyu Hou)
342a345d1f Fixed code style 2015-05-21 15:35:36 -07:00
Jerry (Xinyu Hou)
257c19ecc4 Deprecated and moved clipboard functionality into new protocol #4601 2015-05-21 15:34:28 -07:00
Adam Potolsky
e4f86a8934 Adding pass/fail retry logic to connection attempts #4697 #4650 2015-05-21 15:22:39 -07:00
Jerry (Xinyu Hou)
8b49eb6595 Removed unused function #4601 2015-05-21 15:19:00 -07:00
Jerry (Xinyu Hou)
c22e327eed Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-21 11:37:42 -07:00
Nick Bolton
0de7a08b4c Updated wizard version to '4' to force plugin download #4529 2015-05-21 16:49:07 +01:00
Adam Potolsky
18d85f1b6b Merge branch 'master' of https://github.com/synergy/synergy 2015-05-20 16:56:32 -07:00
Adam Potolsky
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
Jerry (Xinyu Hou)
7dbe30cb61 Fixed Linux uses wrong clipboard event #4601 2015-05-20 14:43:58 -07:00
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
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
Nick Bolton
a710b2752b Reintroduced sleep for really fast computers #4624 2015-05-20 16:07:09 +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
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
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
Nick Bolton
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
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
Tom Sparrow
9b87ca3807 Fix missing DLLs after install #3774
The CompanionFile attribute was causing the installer to be confused:
 Won't Overwrite; Won't patch; Existing file is unversioned but modified
and hence not install a bunch of these DLLs in some cases.
2015-05-08 00:54:09 +01: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
932b0f0c55 Fixed GUI doesn't start after install on Windows #4607 2015-05-06 16:19:51 +01:00
Nick Bolton
50c8f87a6a Updated translation files 2015-05-06 15:28:19 +01:00
XinyuHou
9e9e1362ac Fixed typo and regenerated master ts #4596 2015-05-06 14:25:18 +01:00
Jerry (Xinyu Hou)
02bfeff1b2 Merge pull request #4596 from joweiser/patch-1
Typo 'occurred' in WebClient.cpp
2015-05-06 14:00:07 +01:00
XinyuHou
68edff43cd Merge branch 'pr-jpmcmu-macosx-sticky-key-fix' 2015-05-06 13:20:54 +01:00
XinyuHou
1f0adb0d7b Fixed warning on Linux #4570 2015-05-06 12:11:12 +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
Johannes Weiser
82bb539d5e Typo in WebClient.cpp 2015-04-29 22:18:15 +02:00
Adam Potolsky
5266d94faa Added code to fetch openssl libs from archetecture specific location #4587 2015-04-29 11:35:12 -07:00
Adam Potolsky
503a6e26bf Added variable to define location of windows binaries #4587 2015-04-29 10:27:41 -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
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
XinyuHou
fb76dee8cc Reintroduced GUI auto-hide setting (disabled by default) #4569 2015-04-23 15:37:07 +01:00
XinyuHou
fb6186304b Dropped SSLv3 support #4567 2015-04-23 13:02:42 +01:00
XinyuHou
decf7ca313 Removed unused dependency #4520 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
363dc78ca8 Updated local fingerprint after wizard is finished #4557 2015-04-21 17:56:01 +01: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
f56d06d95d Disabled auto-hide feature #4390 2015-04-21 16:25:55 +01:00
Nick Bolton
d184be31b5 Fixed: SSL dir not created on Mac #4551 2015-04-21 14:48:28 +01:00
Nick Bolton
dbc5da7a48 Refactored certificate class (part 2) #4549 2015-04-21 12:55:45 +01:00
Nick Bolton
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
Nick Bolton
a894615ca7 Fixed ns plugin using old certificate path #4525 2015-04-20 19:08:03 +01:00
Nick Bolton
f997aea8e7 Moved SSL generate code as is into new class #4549 2015-04-20 18:51:22 +01:00
Nick Bolton
2a2d095527 Merge branch 'master' of https://github.com/synergy/synergy 2015-04-20 16:53:34 +01:00
Nick Bolton
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
Nick Bolton
97060d9698 Removed unused SSL download code #4546 2015-04-20 16:31:36 +01:00
Nick Bolton
a649a0e3df Reduced code duplication in fingerprint logic #4548 2015-04-20 16:28:26 +01:00
XinyuHou
5e2b8a5048 Fixed #4537 by add file error checking 2015-04-20 16:16:53 +01:00
Nick Bolton
80fd3cc01b Refactored fingerprint file path logic #4525 2015-04-20 15:58:11 +01:00
Nick Bolton
36a6bb9218 Removed OpenSSL download from plugin manager #4546 2015-04-20 15:27:24 +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
Nick Bolton
453638fa39 Added OpenSSL component to installer #4546 2015-04-20 14:35:52 +01:00
XinyuHou
365d16c94b Added more status details #4537 2015-04-17 16:33:43 +01:00
XinyuHou
586a893201 Made retry secure write/read use the exactly last parameters #4539 2015-04-17 14:01:35 +01:00
XinyuHou
951cbe9a62 Enable network security checkbox only when ns plugin exists #4540 2015-04-16 17:15:58 +01:00
XinyuHou
59d013ac6a Show fingerprint only when file exists #4526 2015-04-16 17:12:42 +01:00
XinyuHou
88538e5ee6 Resolve #4526 added local fingerprint in server GUI 2015-04-16 15:10:33 +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
14bf90264e Renamed function, was reserved keyword on Mac #4522 2015-04-15 14:49:05 +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
Nick Bolton
6580ad0015 Merge branch 'master' of https://github.com/synergy/synergy 2015-04-15 13:40:55 +01:00
XinyuHou
2752d24dc4 Merge branch 'jerry-sandbox' 2015-04-15 13:33:39 +01:00
Xinyu Hou
e405ec25e3 Always log out server fingerprint #4522 2015-04-15 13:25:18 +01:00
Nick Bolton
689737ee7a Fingerprint file check and trust logic #4522
Also refactored the 'get profile dir' code to use the core interface
(reduce code duplication)
2015-04-15 13:09:22 +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
dd574c4f2c Added unit tests for string operations 2015-04-14 17:51:50 +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
Nick Bolton
07b1ea203f Message box asking user to verify fingerprint #4522 2015-04-14 17:29:08 +01:00
Nick Bolton
6e2ccb8f8d Merge pull request #4422 from legonigel/shortcut_fix
Changed server shortcut on GUI main window
Fixes #4367
2015-03-28 08:56:36 +00: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
legonigel
393ac100c8 Changed shortcut on main window gui for server
The shortcut for the server checkbox on the main gui is now Alt-V. This deconflicts the start/stop button.
Fixes #4367
2015-03-09 11:47:13 -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
a2524d9f57 Make profile dir hack Windows only #4168 2015-03-04 11:51:56 +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
065960926c Made OpenSSL config file location Windows-only #4313 2015-03-03 19:51:41 +00:00
Nick Bolton
40fa58de8c More robust secure socket error handling #4313 2015-03-03 19:21:14 +00:00
Nick Bolton
b6a3788fea Removed remnants of synmacph tool (part 3) #4398 2015-03-03 18:06:02 +00:00
Nick Bolton
7add4f4d3f Fixed: Compile errors on Linux #4168 2015-03-03 17:29:52 +00:00
Nick Bolton
b8a5abc19f Download and extract OpenSSL dependencies #4313 2015-03-03 11:42:26 +00:00
Nick Bolton
c181d5f480 Fixed #4358 - Corrected typo 2015-03-03 09:23:06 +00:00
Nick Bolton
68a49e0a3a Fixed: Code style for "OpenSSL" should be "OpenSsl" #4313 2015-03-03 08:38:27 +00:00
Nick Bolton
f8847bfde8 Changed OpenSSL to SSL in GUI settings #4313 2015-03-03 08:36:01 +00:00
Nick Bolton
bce1d5be64 Fixed: Plugin manager doesn't download openssl.exe #4313
Refactored use of DataDownloader in PluginManager
2015-03-03 08:27:39 +00:00
Nick Bolton
450435d062 Removed remnants of synmacph tool (part 2) #4398 2015-03-02 18:06:23 +00:00
Nick Bolton
5767790e1e Removed remnants of synmacph tool #4398 2015-03-02 17:50:42 +00:00
Nick Bolton
6e7b9491d4 Fixed: Incorrect log level used #4168 2015-02-26 16:44:15 +00:00
Michael Wilson
9314e64ce3 Drag/drop enabling is configurable in the GUI. 2015-02-26 02:01:00 -05: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
64c350fd96 Fixed: Plugin manager doesn't detect wow64 #4168 2015-02-25 21:22:43 +00:00
Nick Bolton
e4199b976e Improved wording for enable OpenSSL setting #4313 2015-02-25 18:15:38 +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
Nick Bolton
40d304dc24 Refactored "syntool" usage into CoreInterface #4168 2015-02-25 17:19:33 +00:00
Nick Bolton
595e403c87 Fixed: Spinner doesn't stop when no plugins #4168
Also refactored duplicate code
2015-02-25 08:35:07 +00:00
Nick Bolton
c300b65662 Fixed: Plugin downloader freezes if no plugins #4168 2015-02-25 08:17:16 +00:00
Nick Bolton
a30a685ed2 Improved wording on plugin downloader #4168
Also used translate function on strings
2015-02-25 08:16:24 +00:00
Nick Bolton
3a0068ec2e Fixed: Plugin downloader fails if no plugins #4168 2015-02-24 21:19:52 +00:00
Nick Bolton
5e580e5266 Improved use of English on activate screen #4168 2015-02-20 19:58:37 -05:00
Adam Potolsky
bca57674d0 Added patch that will better detect which Linux distribution is used when determining which plugins to URL to generate. 2015-02-14 19:25:22 -08:00
Adam Potolsky
b9e178a9ee Fixed compiler warning on non-windows systems. 2015-02-14 19:22:08 -08: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
d642714fe8 add padlock icon when use secure connection #4313 2015-02-13 10:14:11 +00:00
XinyuHou
629f4b1781 used live url for openssl binary #4168 2015-02-12 17:40:38 +00:00
XinyuHou
4cd20d97ea changed profile directory on mac #4168 2015-02-12 16:52:34 +00:00
XinyuHou
81bb74a24b greyed out network security group when no plugin available #4168 2015-02-12 16:49:18 +00:00
XinyuHou
6cf40afcd7 added copyright #4168 2015-02-12 16:20:03 +00:00
XinyuHou
14bd991b24 productized setting dialog #4168 2015-02-12 16:18:44 +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
82b932b1c4 added download plugin page in wizard #4168 2015-02-05 15:52:50 +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
c25b6a8bf6 Revert "stored user email, token and type in settings #4168"
This reverts commit 319de60286.
2015-02-05 11:44:31 +00:00
XinyuHou
f4f7315a54 Revert "added copy right #4168"
This reverts commit e2fb03b8ce.
2015-02-05 11:44:28 +00:00
XinyuHou
fc04901cda Revert "moved gui into main subfolder #4168"
This reverts commit 39f98d8133.
2015-02-05 11:44:23 +00:00
XinyuHou
db1a611171 Revert "added plugin manager gui #4168"
This reverts commit bfa9bab78d.
2015-02-05 11:44:14 +00:00
XinyuHou
c34928b7c8 Revert "seperated login result and edition type #4168"
This reverts commit da68664bda.
2015-02-05 11:44:10 +00:00
XinyuHou
c81fa7db52 Revert "changed login window to dialog #4168"
This reverts commit d1c1d79453.
2015-02-05 11:44:04 +00:00
XinyuHou
52005f0905 Revert "changed plugin manager gui from window to dialog #4168"
This reverts commit 1132da4598.
2015-02-05 11:43:54 +00:00
XinyuHou
a0090c69ba wq
Revert "fixed plugin gui compile error on mac #4168"

This reverts commit f6d4cf1c38.
2015-02-05 11:42:08 +00:00
Xinyu Hou
f6d4cf1c38 fixed plugin gui compile error on mac #4168 2015-02-04 19:11:54 +00:00
XinyuHou
1132da4598 changed plugin manager gui from window to dialog #4168 2015-02-04 18:17:06 +00:00
XinyuHou
d1c1d79453 changed login window to dialog #4168 2015-02-04 17:30:06 +00:00
XinyuHou
da68664bda seperated login result and edition type #4168 2015-02-04 15:07:52 +00:00
XinyuHou
bfa9bab78d added plugin manager gui #4168 2015-02-04 14:09:03 +00:00
XinyuHou
39f98d8133 moved gui into main subfolder #4168 2015-02-04 14:04:30 +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
e2fb03b8ce added copy right #4168 2015-02-02 10:52:40 +00:00
XinyuHou
319de60286 stored user email, token and type in settings #4168 2015-01-30 17:38:12 +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
XinyuHou
95a1752396 ported secure socket class from enterprise to ns plugin #4313 2015-01-06 14:20:05 +00:00
XinyuHou
a0f2261931 added new ns plugin #4313 2015-01-06 13:52:11 +00:00
Xinyu Hou
1f41b92693 Fixed client detected dialog not shown when Synergy is minimized #4307 2015-01-05 13:32:58 +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
ebba77fd33 Suppressed empty server warning on startup #4240 2014-12-02 15:03:19 +00:00
Xinyu Hou
db9f7974ed Fixed #4249 by add retain count for extension string 2014-12-02 12:36:01 +00:00
Xinyu Hou
774b217e8f Fixed typo #4247 2014-12-01 18:32:00 +00:00
Xinyu Hou
0d3f14adb9 Fixed name conflict #4247 2014-12-01 18:19:20 +00:00
Xinyu Hou
b60608ece9 Fixed #4247 - Added firewall exception 2014-12-01 17:46:42 +00:00
Xinyu Hou
917c75026f Show add client dialog only if main window is active #4230 2014-12-01 11:22:42 +00:00
Xinyu Hou
48b552a0e8 Made auto config checked after Bonjour download #4235 2014-11-28 16:34:16 +00:00
Xinyu Hou
e6e4f1b53d Deleted the download thread in a Qt way #4235 2014-11-28 15:23:08 +00:00
Xinyu Hou
17278f7224 Closed wizard then open mainwindow #4235 2014-11-28 15:01:23 +00:00
Xinyu Hou
4452f14114 Updated zeroconf after Bonjour is installed #4235 2014-11-28 12:57:57 +00:00
Xinyu Hou
00d6b23d57 Use auto config if Bonjour already installed #4240 2014-11-28 11:21:45 +00:00
Xinyu Hou
581d4c5469 Added a icon for download message box #4235 2014-11-28 10:54:51 +00:00
Xinyu Hou
216f0f160d Resolved #4242 keep auto config name consistent 2014-11-28 10:51:52 +00:00
Xinyu Hou
1730258311 Fixed wrong download message box title #4235 2014-11-27 19:11:01 +00:00
Xinyu Hou
d448fb777b Merged 2 msgboxes into 1 when first startup #4240 2014-11-27 19:08:30 +00:00
Xinyu Hou
a0cc3d6e7f Made Bonjour install in another thread #4235 2014-11-27 18:31:45 +00:00
Xinyu Hou
af4817d075 Suppressed auto connect warning on startup #4240 2014-11-27 18:31:42 +00:00
Xinyu Hou
54e294bffb Improved auto connect massage #4237 2014-11-27 10:52:25 +00:00
Xinyu Hou
79f534273f Ran Bonjour installer in passive mode 2014-11-27 10:52:21 +00:00
Xinyu Hou
dff2cb34be Download Bonjour installer according to system architecture 2014-11-27 10:52:19 +00:00
Xinyu Hou
d89cb46912 Showed auto connect prompt after main window 2014-11-27 10:52:17 +00:00
Xinyu Hou
2e744b0f02 Auto start Synergy after a new client added 2014-11-27 10:52:16 +00:00
Xinyu Hou
3b1e15ba08 Try user specified name when auto detect failed 2014-11-27 10:52:14 +00:00
Xinyu Hou
97ea94de69 Solved zeroconf service name conflict 2014-11-27 10:52:12 +00:00
Xinyu Hou
5222b81600 Changed message box when no server detected 2014-11-27 10:52:10 +00:00
Xinyu Hou
c560eabeb2 Fixed close null mutex and condvar 2014-11-27 10:52:08 +00:00
Xinyu Hou
f022d814e6 Removed duplicated arch instance 2014-11-27 10:52:07 +00:00
Xinyu Hou
7c02369437 Stopped starting synergy when server is detected 2014-11-27 10:52:05 +00:00
Xinyu Hou
5afd94edb3 Added mutex for updating zeroconf service 2014-11-27 10:52:03 +00:00
Xinyu Hou
c323003f65 Removed dead code 2014-11-27 10:52:01 +00:00
Xinyu Hou
40ef0b03c2 Made Mac buttons the same layout as Windows ones 2014-11-27 10:51:59 +00:00
Xinyu Hou
e71e7e1cd3 Catched exception while getting active desktop name 2014-11-27 10:51:58 +00:00
Xinyu Hou
5833b434ef Changed message box types 2014-11-27 10:51:56 +00:00
Xinyu Hou
a289c1cbe3 Showed first tab in server config dialog as default 2014-11-27 10:51:54 +00:00
Xinyu Hou
20db8d55af Modified and centered install Bonjour msgbox 2014-11-27 10:51:52 +00:00
Xinyu Hou
ec4ef549bb Added ignore auto connect clients check box in dialog 2014-11-27 10:51:50 +00:00
Xinyu Hou
471e198efc Fixed race condition for updating zeroconf service 2014-11-27 10:51:49 +00:00
Xinyu Hou
56b3231a6c Made service error log more readable 2014-11-27 10:51:47 +00:00
Xinyu Hou
22475067de Fixed the warning logic when hostname is empty 2014-11-27 10:51:45 +00:00
Xinyu Hou
1a69f458b7 Shown client name in detect dialog 2014-11-27 10:51:42 +00:00
Xinyu Hou
2aec1223ae Show server list when 2 or more servers detected 2014-11-27 10:51:39 +00:00
Xinyu Hou
66a1ffa5f5 Added ignore auto connect clients check box 2014-11-27 10:51:36 +00:00
Xinyu Hou
aa9990fba9 Updated server config dialog UI generated by Qt 2014-11-27 10:51:33 +00:00
Xinyu Hou
b2435cdaef Resolve #4230 more user friendly dialog when client is detected 2014-11-27 10:51:29 +00:00
Xinyu Hou
30f478ad5c Fixed legacy resource filename 2014-11-27 10:51:25 +00:00
Xinyu Hou
fa1092d665 Resolve zeroconf uses bogus IPs #4091 2014-11-27 10:51:22 +00:00
Xinyu Hou
8d7f6e146d Fixed startSynergy twice when detect the first server 2014-11-27 10:51:18 +00:00
Xinyu Hou
f0cb271902 Resolved Auto-conf server select #4218 2014-11-27 10:51:15 +00:00
Xinyu Hou
6cb589d18e Made Bonjour install Windows only #4196 2014-11-27 10:51:12 +00:00
Xinyu Hou
6fd8afafbd Solved #4196 by download and open Bonjour installer 2014-11-27 10:51:08 +00:00
Xinyu Hou
376c983d21 Added cancel download 2014-11-27 10:51:05 +00:00
Xinyu Hou
8503833e3d Added seamless download of Bonjour 2014-11-27 10:51:01 +00:00
Xinyu Hou
f781cce156 Prompt to enable auto connect #4196 2014-11-27 10:50:58 +00:00
Xinyu Hou
5bd65b5426 Added download Bonjour code 2014-11-27 10:50:54 +00:00
Xinyu Hou
330121ce55 Asked users if they want to install Bonjour 2014-11-27 10:50:51 +00:00
Xinyu Hou
5db30cff74 Fixed memory leak 2014-11-27 10:50:47 +00:00
Xinyu Hou
588494a730 Check is Bonjour running before update zeroconf 2014-11-27 10:50:44 +00:00
Xinyu Hou
6ef744cd81 Added code to check if Bonjour service is running 2014-11-27 10:50:40 +00:00
Xinyu Hou
c51ce29954 Removed Bonjour dependency in wix 2014-11-27 10:50:37 +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
afa24f4a02 Disable the privilege helper tool #4191 2014-11-06 17:08:58 +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
117208754f Hided elevate checkbox on Unix #4130 2014-10-27 17:15:50 +00:00
Xinyu Hou
23670c5f9b Moved elevate checkbox to settings #4130 2014-10-27 17:10:12 +00: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
39b534f3b8 Merge branch 'petroules-mac-fixes' 2014-10-27 13:04:59 +00:00
Xinyu Hou
de68346874 Fixed hm config error 2014-10-27 11:58:25 +00:00
Xinyu Hou
df29bf8e54 Merge branch 'helkanen-master' 2014-10-24 15:10:44 +01:00
Jake Petroules
5b4e46f8ea Fix Info.plist for Synergy GUI.
This fixes the blurriness on Retina displays.
2014-10-23 08:29:51 -07: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
a58ca97941 Merge remote-tracking branch 'origin/master' 2014-10-21 16:00:56 +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
Xinyu Hou
38718a362f Enable drag and drop by default #4122
Remove premium login from GUI
2014-10-15 14:57:28 +01: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
32feab2ef1 issue #65 - Auto config feature using Zeroconf/Bonjour
added warning during installation if bonjour not installed on Windows
2014-08-26 17:37:39 +00:00
jerry
cdc740c5d1 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
added massage box to ask user where to add client
2014-08-26 14:49:27 +00:00
jerry
aa2accf5a6 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
renamed tryFixNoServer to fixNoServer
2014-08-26 11:27:17 +00:00
jerry
a2d3b5c7e2 issue #65 - Auto config feature using Zeroconf/Bonjour
gave user an option to toggle auto connect
2014-08-26 11:22:09 +00:00
jerry
828f7c02b1 issue #65 - Auto config feature using Zeroconf/Bonjour
matched argument in error handle
2014-08-26 10:25:01 +00:00
jerry
2ec6a49795 issue #65 - Auto config feature using Zeroconf/Bonjour [no-build]
reverted position order back
2014-08-26 10:10:25 +00:00
jerry
eb99e843c2 issue #65 - Auto config feature using Zeroconf/Bonjour
fixed start button was broken
2014-08-26 10:09:23 +00:00
jerry
deb45ad393 issue #65 - Auto config feature using Zeroconf/Bonjour
change position order to left first then right
2014-08-26 09:42:24 +00:00
jerry
ff5ca8b8aa issue #65 - Auto config feature using Zeroconf/Bonjour
added needed dll on windows, so no need to dependent on bonjour installation
2014-08-22 13:46:20 +00:00
jerry
8cad7551e6 issue #65 - Auto config feature using Zeroconf/Bonjour
merging zeroconf into trunk
2014-08-21 17:32:40 +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
547d99f7af issue #3404 - Log path needs to be in quotes on windows
fixed compile error
2014-06-18 13:14:12 +00:00
jerry
559237f930 issue #3404 - Log path needs to be in quotes on windows
issue solved.
2014-06-18 12:59:30 +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
ae4d8cee2a issue #3307 - Configuration file paths containing spaces don't work
issue solved
2014-05-28 12:05:05 +00:00