673fba5846
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-25 12:38:33 -07:00
3aebb87b37
Fixed using old log level convention #4745
2015-06-25 11:25:58 -07:00
9dc0a1d862
Added comment for clarity #4750
2015-06-25 09:54:28 -07:00
25c1754d2d
Merge branch 'master' into adam-sandbox
2015-06-25 09:46:21 -07:00
4569de5413
Fixed misplaces statis string in windows code #4793
2015-06-25 09:44:16 -07:00
d7043ef84b
Added plugin version output to unix builds #4793
2015-06-25 09:35:56 -07:00
55a38ff8cc
removed unnecessary flag settings, fixed wrong call. #4750
2015-06-24 17:57:22 -07:00
f10f0f13c4
retry case needs to do another job with the same parameters not just a new job #4750
2015-06-24 16:31:47 -07:00
2df88e07c4
fixed retry logic for secure connect and accept #4750
2015-06-24 12:20:25 -07:00
e50b239592
Changed secure connest and accept to match read/write retry logic #4750
2015-06-24 11:11:20 -07:00
6442bcb8f6
Change PluginWizardPage to take and use MainWindow instead of appConfig #4823
2015-06-23 17:11:39 -07:00
19f5ad8cab
Add delay routine to MainWindow to allow sleep in a Qt friendly way #4823
2015-06-23 17:10:49 -07:00
267f3ac41f
workaround for Fast cursor on any client with Mac server #451
2015-06-19 17:20:26 -07:00
121080be74
removed non-existant file from gui.pro to remove warning #4810
2015-06-18 14:45:41 -07:00
d51e2e4fb1
Merge branch 'v1.7.4-stable' of https://github.com/synergy/synergy into v1.7.4-stable
2015-06-18 14:19:06 -07:00
3eef49d5c9
Removed mutex locking from get and set of log level #4809
2015-06-18 14:18:05 -07:00
f3472c84e2
Show notification only on Debug level or above #4745
2015-06-18 13:50:38 -07:00
14046db32a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-15 09:59:38 -07:00
667b6f13c7
Enforced secure socket rewrite on the same buffer address #4712
2015-06-12 18:03:28 -07:00
3e32d9fbee
Improved secure socket intensive try operations #4796
2015-06-12 16:53:41 -07:00
9893a018b1
Merge pull request #4634 from sparrowt/sparrowt-issue3774-fix-missing-dlls
...
Fix missing DLLs after install #3774
2015-06-12 16:14:15 -07:00
768445816b
Merge branch 'adam-sandbox'
2015-06-12 16:03:34 -07:00
efab42962f
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-12 16:03:25 -07:00
afb0e2a2ea
Added log level protection, changed log levels for some logging #4793
2015-06-12 15:07:53 -07:00
16a2815504
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:40:15 -07:00
4b0dec69bf
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:33:28 -07:00
72060e59b4
Fixed send clipboard thread time issue #4749
2015-06-12 11:21:05 -07:00
1e89aa37c5
Merge pull request #4382 from meowfaceman/master
...
Make drag and drop optional #4327
2015-06-12 19:12:57 +01:00
5696497bc0
Added code to throw an error if the plugin can't be deleted or written to #4696
2015-06-11 17:40:26 -07:00
6bb44fbc59
Merge pull request #4228 from galkinvv/fix2866
...
High client CPU usage and laggy mouse
2015-06-11 16:12:40 -07:00
3942dc6ee8
Added stub code for linux/mac builds to match the functional ARCH code for discovering libraris in use #4793
2015-06-11 10:00:45 -07:00
fa0dfa0ded
Added ability to query lib locations to windows builds
2015-06-10 13:18:39 -07:00
8366bb6247
Added OpenSSL version and location logging
2015-06-10 10:20:59 -07:00
f94e1e1660
Disabled intermittently failing unit test #4651
2015-06-10 07:04:58 -07:00
099c984d7d
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-09 16:05:43 -07:00
f36d257495
Updated the comments
2015-06-09 15:48:08 -07:00
81acb96540
Tried to fix random unittest fail (part2)
2015-06-09 15:33:57 -07:00
0c211e2852
Adding logging output when ssl connects for aid in debugging and support
2015-06-09 14:07:42 -07:00
deb3db93e6
Tried to fix random unittest fail
2015-06-09 13:59:04 -07:00
8e15b77db3
Added warning for enable encryption #4584
2015-06-08 15:39:33 -07:00
756000d8a9
Removed warning and error logging level in GUI #4745
2015-06-08 14:44:31 -07:00
a21e4cd73b
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-08 13:53:01 -07:00
ed37eeca51
Merge branch '4696'
2015-06-08 13:24:47 -07:00
155a8b70c4
Added version string to plugin and added to plugin loaded message
2015-06-05 17:07:47 -07:00
2db2ffac84
Adding Windows Plugins Directory to install #4696
2015-06-05 16:55:36 -07:00
5c71efebe6
Fixed integtests #4584
2015-06-05 15:23:44 -07:00
756c3b4463
Inserted keep alive msg among data transfer #4584
2015-06-05 15:21:32 -07:00
bbf53bb9b8
Return the same job on retry #4584
2015-06-05 15:21:26 -07:00
0680c33909
Added file events #4584
2015-06-05 15:21:17 -07:00
7795d68c21
Removed magic number #4712
2015-06-04 14:46:47 -07:00
eb3f8aee2a
Notified file transmission interrupted #4745
2015-06-04 14:43:49 -07:00
88e5c6197d
Trivial whitespace fix cause by by editor settings
2015-06-04 14:06:17 -07:00
646e1b52eb
Interrupted file transfer when cursor move back #4584
2015-06-04 13:09:48 -07:00
e0903983ad
Validated file expected size #4584
2015-06-04 10:19:36 -07:00
8c64cbf54e
Refactored send drag info on server #4584
2015-06-04 10:04:08 -07:00
78f8fb45ba
Fixed Installed Directory in ARCH for MacOS #4696
2015-06-04 09:58:22 -07:00
ee22e688d5
Removed clipboard ignore notification #4745
2015-06-03 17:32:09 -07:00
d9684d44d2
Added fake drag file list #4584
2015-06-03 16:17:26 -07:00
4508e10186
Fixed IpcLogOutputterTest #4721
2015-06-03 15:23:33 -07:00
7614a21aac
Cleared buffer on send instead of write #4721
2015-06-03 14:45:47 -07:00
c4e8dc7198
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-02 15:30:33 -07:00
ad9cfd64af
Added symbolic link creation to linux and macos #4696
2015-06-02 14:29:01 -07:00
0061969cf2
Updating installed dir for Linux and MacOS #4696
2015-06-02 14:28:20 -07:00
22e8d3d03a
Fixed clipboard transmission messing up start/stop $4745
2015-06-02 13:42:27 -07:00
8d0fdee5ce
Added full stop for notification #4745
2015-06-02 11:18:21 -07:00
f42b756b0e
Added clipboard transmission failed notification #4745
2015-06-02 11:17:04 -07:00
f22d9ac477
Added clipboard transmission start notification #4745
2015-06-02 11:14:28 -07:00
d9921c894c
Added clipboard transmission notification #4745
2015-06-02 09:48:26 -07:00
ce2c797f69
Made code more readable #4745
2015-06-01 16:58:21 -07:00
3d55516fdf
Removed unused code #4745
2015-06-01 16:56:52 -07:00
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
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
4a7fdabd65
Added Installed Dir to PluginManager #4696
2015-06-01 16:46:33 -07:00
5d770d4204
Added getInstallDir to Core Interface #4696
2015-06-01 16:43:57 -07:00
98bb9b3fb3
Added getInstalledDir to ToolApp. #4696
2015-06-01 16:43:27 -07:00
4533063768
Fixed compile error on Unix #4745
2015-06-01 16:04:13 -07:00
bfe616eebe
Added file transmission started notification for server #4745
2015-06-01 16:00:35 -07:00
d1ca021002
Monitoring log to show notification and made icon change while transfering $4745
2015-06-01 15:59:59 -07:00
5cbcd74028
Fixed using NOTE level logging on Mac #4745
2015-06-01 23:42:58 +01:00
e7f358afb2
Added file transmission started, failed and complete notification #4745
2015-06-01 15:33:06 -07:00
5006adedfe
Changed note to notify #4745
2015-06-01 14:46:08 -07:00
d3a4ce1f11
Moved note into either warning or info #4745
2015-06-01 14:31:32 -07:00
ecf0485e8f
Removed commented out code #4745
2015-06-01 12:39:30 -07:00
4a27c0b05c
Added drop file notification on client #4745
2015-06-01 11:57:43 -07:00
bd3a8e9429
Fixed unittest for ipcLogOutputter #4721
2015-05-29 17:48:53 -07:00
97bac70fae
Stop writing into and clear buffer when no GUI #4721
2015-05-29 16:55:22 -07:00
4bf1eeb065
Removed unnecessary method and static data #4696
2015-05-29 16:47:51 -07:00
1229974d2f
Merge branch 'master' into 4696
...
Conflicts:
src/gui/src/PluginManager.cpp
2015-05-29 16:39:31 -07:00
e35fd80cef
Fixed name for Mac and Linux Build #4696
2015-05-29 16:20:47 -07:00
8d70075171
Replaces plugin download with install and copy functionality #4696
2015-05-29 15:57:21 -07:00
9487db1672
Merge pull request #4722 from maximd/master
...
Fix issue synergy/synergy#4720
2015-05-28 16:58:44 -07:00
d7063a87c8
Fixed using wrong local variable #4723
2015-05-27 10:32:13 -07:00
aec52c36e6
Added timeout for waiting active destop result #4723
2015-05-27 10:18:45 -07:00
3498d1bc8e
Used synergy::string::sprintf instead of append #4690
2015-05-27 09:52:58 -07:00
03fc9b5fa7
Fix issue synergy/synergy#4720
2015-05-27 18:34:47 +02:00
d83cb23cc7
Reverted 8b9758 #4712
2015-05-26 17:25:18 -07:00
907b02fb09
Used log system instead of stdout (part 2) #4690
2015-05-26 17:18:14 -07:00
3788084e43
Merge branch 'jerry-sandbox' of https://github.com/synergy/synergy into jerry-sandbox
2015-05-26 17:13:09 -07:00
f063b094ec
Used log system instead of stdout #4690
2015-05-26 17:12:58 -07:00
dba46707b2
Removed SSL chunk size limitation #4712
2015-05-26 13:31:15 -07:00
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
fd72bf17ce
Reworded SSL errors to be more consistent #4650
2015-05-26 14:17:30 +01:00
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
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
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
4aa57cfbdb
Fixed code style, more consistent logging #4650
2015-05-25 20:24:29 +01:00
1cea4bb80f
Fixed code style, use lower case for logging #4650
2015-05-25 20:20:12 +01:00
0fdcfe9b95
Fixed code style, prefer enums over macros #4650
2015-05-25 20:20:12 +01:00
3563217c7b
Fixed Mac package platform variable name #4708
2015-05-25 19:54:34 +01:00
590d0482b3
Removed useless processor type return for Mac #4708
2015-05-25 19:54:21 +01:00
e8a43dd020
Simplified logic to detect Linux 64/32 deb/rpm #4565
2015-05-25 19:41:53 +01:00
e479f16705
Incremented default plugin version to 1.1
2015-05-25 18:59:58 +01:00
cae767735c
Download specific plugin version on Mac #4708
2015-05-25 18:59:58 +01:00
14bb44f539
Comment explaining lack of 10.7 support #4695
2015-05-25 17:41:38 +01:00
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
a900543c1d
Allowed Mac OS X 10.7 to build ns plugin #4695
2015-05-25 16:53:46 +01:00
b71c298163
Changed sleep time to 100ms for unit test (hack) #4651
2015-05-25 15:25:14 +01:00
18344e6b52
Copy ns plugin to debug dir when in debug mode #4704
2015-05-25 13:08:47 +01:00
f322a79760
Copy plugins to config dir on Mac #4703
2015-05-25 13:07:36 +01:00
b1f2abbaae
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 16:39:33 -07:00
fb3252efef
Added a way to interrupt sending clipboard/file #4601
2015-05-23 00:34:00 +01:00
905dbfee90
Fixed order of initializers for mac build #4697
2015-05-22 16:26:40 -07:00
773530506e
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 16:10:29 -07:00
35e09c46b9
Changed secureSocket routines to return a status, and modify an argument for num of bytes handled #4697
2015-05-22 16:09:59 -07:00
ff9ad5554a
Used different chunk size for SSL and non-SSL socket #4601
2015-05-22 13:30:50 -07:00
36ddc4f1c1
Fixed indentation
2015-05-22 13:10:22 -07:00
625feab104
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 12:40:24 -07:00
c1d859e35a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-22 11:28:39 -07:00
a81b88c730
Refactored file assemble and send code #4601
2015-05-22 11:27:57 -07:00
7b718dc586
Forgot to change linux specific variable name #4697
2015-05-22 11:17:10 -07:00
86ad2bf080
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-22 10:56:33 -07:00
5b3fa48902
Made socket self-aware of when it is in a fatal state #4697
...
Added code to cleanly terminate connection on fatal socket state #4697
2015-05-22 10:56:13 -07:00
1df566d241
Refactored duplicated code #4601
2015-05-21 17:50:55 -07:00
1c28444cf6
Refactored duplicated code #4601
2015-05-21 16:04:50 -07:00
342a345d1f
Fixed code style
2015-05-21 15:35:36 -07:00
257c19ecc4
Deprecated and moved clipboard functionality into new protocol #4601
2015-05-21 15:34:28 -07:00
e4f86a8934
Adding pass/fail retry logic to connection attempts #4697 #4650
2015-05-21 15:22:39 -07:00
8b49eb6595
Removed unused function #4601
2015-05-21 15:19:00 -07:00
c22e327eed
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-21 11:37:42 -07:00
0de7a08b4c
Updated wizard version to '4' to force plugin download #4529
2015-05-21 16:49:07 +01:00
18d85f1b6b
Merge branch 'master' of https://github.com/synergy/synergy
2015-05-20 16:56:32 -07:00
68ecdc0753
Added additional logging to help debug potential problems related to performance and SSL WAIT states #4650
2015-05-20 16:54:42 -07:00
7dbe30cb61
Fixed Linux uses wrong clipboard event #4601
2015-05-20 14:43:58 -07:00
ad86041433
Added code to test for and error out of max retry condition #4650
2015-05-20 14:27:25 -07:00
1af9d58a9b
Changed conditional to match coding standard #4650
2015-05-20 14:14:30 -07:00
81a70135bd
Added concept of a max retry count to SecureSocket class #4650
2015-05-20 13:50:18 -07:00
994a9433fe
Converting retry to a counter #4650
2015-05-20 12:08:25 -07:00
3e9fc89d96
Modified server to use correct clipboard format #4601
2015-05-20 19:54:56 +01:00
490667e21b
Used StreamChunker to send clipboard in chunks #4601
2015-05-20 19:54:17 +01:00
cf5347c8f6
Sent clipboard on a thread #4601
2015-05-20 19:53:30 +01:00
49ac320f97
Refactored clipboard event into ClipboardEvent #4601
2015-05-20 19:09:54 +01:00
950219b39e
Fixed init order warning on Mac #4624
2015-05-20 17:51:52 +01:00
561204b2a7
Disabled threading on most IPC logging tests #4624
...
Threading was making it very hard to reliably run the IPC logging tests
(many timing issues), so I disabled threading for most of the tests.
2015-05-20 17:42:07 +01:00
89a977da66
Positive tests for IPC logging #4624
...
So far I had only tested what happens when the limits are exceeded.
These new tests are for when usage is within limits.
2015-05-20 16:16:22 +01:00
a710b2752b
Reintroduced sleep for really fast computers #4624
2015-05-20 16:07:09 +01:00
9636af61d6
Solution attempt for timing bugs in write_bufferRateLimit
...
It's probably better to wait until the buffer is sent, rather than
waiting until its empty. To test the output it has to be sent, but
because of timing, it may be emptied at any point.
2015-05-20 15:51:07 +01:00
f1af62927e
Stopped Unix plugin loader from throwing #4661
...
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
a6dfbbe021
Validated received clipboard data size #4601
2015-05-19 14:28:38 -07:00
2c74a7f5c1
Added stringToSizeType and its unittest #4601
2015-05-19 14:23:43 -07:00
c032091dd5
Added send clipboard finish log #4601
2015-05-19 13:51:13 -07:00
00ceda55dc
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-05-19 11:37:45 -07:00
eaff6f50f8
Added sending clipboard chunks handling #4601
2015-05-19 10:54:02 -07:00
6e7b3d87c5
Added changes for StreamChunker that is left from last commit #4601
2015-05-19 09:37:15 -07:00
c674642181
Used StreamChunker for clipboard and file transfer #4601
...
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
11a7d2c4c2
Stopped Windows plugin loader from throwing #4661
...
System error message hidden with 'SetErrorMode(SEM_FAILCRITICALERRORS)'
2015-05-19 14:40:33 +01:00
46527ded56
Limited Windows service log file size to 1MB #4677
...
Oversized file is renamed to .1 to keep old log files in case needed,
but the old file will eventually be overwritten on 2nd recycle
2015-05-19 14:04:02 +01:00
2cce60f672
Fixed sleep timing on IPC log rate limit unit tests #4624
...
Still a little hacky, but seems stable on my dev machine
2015-05-19 10:41:04 +01:00
efa358f917
Added comment about hacky log line #4690
...
@XinyuHou, when adding hacks, please annotate with a comment
2015-05-19 10:28:02 +01:00
70be9cd97f
Refactored intToString #4601
2015-05-18 11:27:54 -07:00
af73e8280d
Increased protocol version number to 1.6 #4601
2015-05-18 11:25:58 -07:00
62a501066f
Disabled IPC logging tests for Mac and Linux #4624
...
This is a bit hacky, but IPC logging isn't used on Mac and Linux anyway,
and we're hopefully going to remove it.
2015-05-18 18:19:43 +01:00
30f96b9fbb
Renamed FileChunker to StreamChunker #4601
2015-05-18 10:17:22 -07:00
9f577ca4f3
Added rate limiting to IPC logging #4624
2015-05-18 18:06:58 +01:00
b27b236c07
Disabled failing IPC tests for Mac #4651
2015-05-18 16:39:54 +01:00
984c5885f7
Fixed Mac build by hacking out mutex close #4651
2015-05-18 16:09:09 +01:00
4c36c08099
Send clipboard data in a thread #4601
2015-05-16 00:06:38 +01:00
44089d55e8
Send clipboard data in small chunks without using thread #4601
2015-05-15 22:28:43 +01:00
e60b3a6feb
Added truncating to IPC log buffer queue #4651
...
When the IPC log buffer is too large, the oldest log line is removed
when a new log line is added.
2015-05-15 15:04:16 +01:00
aac59fbf7e
File missing from last commit #4651
2015-05-15 14:44:25 +01:00
2e3769c7a6
Added failing test for IpcLogOutputter::write(...) #4651
...
- Changed behavior of close() to stop the buffer thread
- Fixed code style in IpcLogOutputter.cpp
- Changed MAX_SEND macro to enum
- Added Doxygen @name sections
2015-05-15 14:43:42 +01:00
08aee6cba7
Fixed cast error from pointer to small type on Unix #4601
2015-05-14 14:39:03 -07:00
220b6befab
Used a thread to send clipboard data #4601
2015-05-14 13:51:21 -07:00
134a15ea8d
Modified IpcServer to be mockable #4651
...
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
8c82996fc4
Merge pull request #4608 from legonigel/master
...
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07:00
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
1c5ade982e
Merge branch 'build_using_openssl_binaries'
2015-05-07 10:26:59 +01:00
d71304ee55
Modified header of every file COPYING to LICENSE
...
Modified to match the updated name of the license file
2015-05-06 22:12:44 -04:00
be1769e4a5
Fixed Mac crashes instantly on syntool segfault #4581
2015-05-06 16:36:49 +01:00
932b0f0c55
Fixed GUI doesn't start after install on Windows #4607
2015-05-06 16:19:51 +01:00
50c8f87a6a
Updated translation files
2015-05-06 15:28:19 +01:00
9e9e1362ac
Fixed typo and regenerated master ts #4596
2015-05-06 14:25:18 +01:00
02bfeff1b2
Merge pull request #4596 from joweiser/patch-1
...
Typo 'occurred' in WebClient.cpp
2015-05-06 14:00:07 +01:00
68edff43cd
Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'
2015-05-06 13:20:54 +01:00
1f0adb0d7b
Fixed warning on Linux #4570
2015-05-06 12:11:12 +01:00
c168721d2f
Added deprecated args handling #4570
2015-05-06 11:57:42 +01:00
c3f003bf5b
Adding new binary installer locations to make files #4587
2015-05-01 16:56:45 -07:00
a88bf3d3f0
Merge branch 'master' of https://github.com/synergy/synergy into build_using_openssl_binaries
2015-04-30 09:31:55 -07:00
82bb539d5e
Typo in WebClient.cpp
2015-04-29 22:18:15 +02:00
5266d94faa
Added code to fetch openssl libs from archetecture specific location #4587
2015-04-29 11:35:12 -07:00
503a6e26bf
Added variable to define location of windows binaries #4587
2015-04-29 10:27:41 -07:00
Jerry (Xinyu Hou)
Adam Potolsky
Adam Potolsky
kahiroka
Nick Bolton
Maxim Doucet
Tom Sparrow
Nigel Armstrong
Johannes Weiser