Commit Graph

918 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou) 3d55516fdf Removed unused code 2015-06-01 16:56:52 -07:00
Adam Potolsky e784b48711 Added use of Installed Dir for finding plugin install directory
Fixed issues with file path creation 
2015-06-01 16:50:05 -07:00
Adam Potolsky c1158ea7f9 Removed speaker and system hard coded locations from code
Removed previously commended out code that is unnecessary 
2015-06-01 16:48:12 -07:00
Adam Potolsky 4a7fdabd65 Added Installed Dir to PluginManager 2015-06-01 16:46:33 -07:00
Adam Potolsky 5d770d4204 Added getInstallDir to Core Interface 2015-06-01 16:43:57 -07:00
Adam Potolsky 98bb9b3fb3 Added getInstalledDir to ToolApp. 2015-06-01 16:43:27 -07:00
Jerry (Xinyu Hou) 4533063768 Fixed compile error on Unix 2015-06-01 16:04:13 -07:00
Jerry (Xinyu Hou) bfe616eebe Added file transmission started notification for server 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 2015-06-01 23:42:58 +01:00
Jerry (Xinyu Hou) e7f358afb2 Added file transmission started, failed and complete notification 2015-06-01 15:33:06 -07:00
Jerry (Xinyu Hou) 5006adedfe Changed note to notify 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou) d3a4ce1f11 Moved note into either warning or info 2015-06-01 14:31:32 -07:00
Jerry (Xinyu Hou) ecf0485e8f Removed commented out code 2015-06-01 12:39:30 -07:00
Jerry (Xinyu Hou) 4a27c0b05c Added drop file notification on client 2015-06-01 11:57:43 -07:00
Jerry (Xinyu Hou) bd3a8e9429 Fixed unittest for ipcLogOutputter 2015-05-29 17:48:53 -07:00
Jerry (Xinyu Hou) 97bac70fae Stop writing into and clear buffer when no GUI 2015-05-29 16:55:22 -07:00
Adam Potolsky 4bf1eeb065 Removed unnecessary method and static data 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 2015-05-29 16:20:47 -07:00
Adam Potolsky 8d70075171 Replaces plugin download with install and copy functionality 2015-05-29 15:57:21 -07:00
Jerry (Xinyu Hou) 9487db1672 Merge pull request from maximd/master
Fix issue 
2015-05-28 16:58:44 -07:00
Jerry (Xinyu Hou) d7063a87c8 Fixed using wrong local variable 2015-05-27 10:32:13 -07:00
Jerry (Xinyu Hou) aec52c36e6 Added timeout for waiting active destop result 2015-05-27 10:18:45 -07:00
Jerry (Xinyu Hou) 3498d1bc8e Used synergy::string::sprintf instead of append 2015-05-27 09:52:58 -07:00
Maxim Doucet 03fc9b5fa7 Fix issue 2015-05-27 18:34:47 +02:00
Jerry (Xinyu Hou) d83cb23cc7 Reverted 8b9758 2015-05-26 17:25:18 -07:00
Jerry (Xinyu Hou) 907b02fb09 Used log system instead of stdout (part 2) 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 2015-05-26 17:12:58 -07:00
Jerry (Xinyu Hou) dba46707b2 Removed SSL chunk size limitation 2015-05-26 13:31:15 -07:00
Nick Bolton 8b975878c2 Limited clipboard size to 1kb when SSL is enabled
@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 2015-05-26 14:17:30 +01:00
Nick Bolton 42ed1c2f27 Increased ssl error rate limit from 50k to 100k
@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
@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)
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 2015-05-25 20:24:29 +01:00
Nick Bolton 1cea4bb80f Fixed code style, use lower case for logging 2015-05-25 20:20:12 +01:00
Nick Bolton 0fdcfe9b95 Fixed code style, prefer enums over macros 2015-05-25 20:20:12 +01:00
Nick Bolton 3563217c7b Fixed Mac package platform variable name 2015-05-25 19:54:34 +01:00
Nick Bolton 590d0482b3 Removed useless processor type return for Mac 2015-05-25 19:54:21 +01:00
Nick Bolton e8a43dd020 Simplified logic to detect Linux 64/32 deb/rpm 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 2015-05-25 18:59:58 +01:00
Nick Bolton 14bb44f539 Comment explaining lack of 10.7 support 2015-05-25 17:41:38 +01:00
Nick Bolton 25237a14b7 Revert "Allowed Mac OS X 10.7 to build ns plugin "
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 2015-05-25 16:53:46 +01:00
Nick Bolton b71c298163 Changed sleep time to 100ms for unit test (hack) 2015-05-25 15:25:14 +01:00
Nick Bolton 18344e6b52 Copy ns plugin to debug dir when in debug mode 2015-05-25 13:08:47 +01:00
Nick Bolton f322a79760 Copy plugins to config dir on Mac 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 2015-05-23 00:34:00 +01:00
Adam Potolsky 905dbfee90 Fixed order of initializers for mac build 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 2015-05-22 16:09:59 -07:00
Jerry (Xinyu Hou) ff9ad5554a Used different chunk size for SSL and non-SSL socket 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 2015-05-22 11:27:57 -07:00
Adam Potolsky 7b718dc586 Forgot to change linux specific variable name 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
Added code to cleanly terminate connection on fatal socket state 
2015-05-22 10:56:13 -07:00
Jerry (Xinyu Hou) 1df566d241 Refactored duplicated code 2015-05-21 17:50:55 -07:00
Jerry (Xinyu Hou) 1c28444cf6 Refactored duplicated code 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 2015-05-21 15:34:28 -07:00
Adam Potolsky e4f86a8934 Adding pass/fail retry logic to connection attempts 2015-05-21 15:22:39 -07:00
Jerry (Xinyu Hou) 8b49eb6595 Removed unused function 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 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 2015-05-20 16:54:42 -07:00
Jerry (Xinyu Hou) 7dbe30cb61 Fixed Linux uses wrong clipboard event 2015-05-20 14:43:58 -07:00
Adam Potolsky ad86041433 Added code to test for and error out of max retry condition 2015-05-20 14:27:25 -07:00
Adam Potolsky 1af9d58a9b Changed conditional to match coding standard 2015-05-20 14:14:30 -07:00
Adam Potolsky 81a70135bd Added concept of a max retry count to SecureSocket class 2015-05-20 13:50:18 -07:00
Adam Potolsky 994a9433fe Converting retry to a counter 2015-05-20 12:08:25 -07:00
Xinyu Hou 3e9fc89d96 Modified server to use correct clipboard format 2015-05-20 19:54:56 +01:00
Xinyu Hou 490667e21b Used StreamChunker to send clipboard in chunks 2015-05-20 19:54:17 +01:00
Xinyu Hou cf5347c8f6 Sent clipboard on a thread 2015-05-20 19:53:30 +01:00
Xinyu Hou 49ac320f97 Refactored clipboard event into ClipboardEvent 2015-05-20 19:09:54 +01:00
Nick Bolton 950219b39e Fixed init order warning on Mac 2015-05-20 17:51:52 +01:00
Nick Bolton 561204b2a7 Disabled threading on most IPC logging tests
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
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 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
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
Jerry (Xinyu Hou) a6dfbbe021 Validated received clipboard data size 2015-05-19 14:28:38 -07:00
Jerry (Xinyu Hou) 2c74a7f5c1 Added stringToSizeType and its unittest 2015-05-19 14:23:43 -07:00
Jerry (Xinyu Hou) c032091dd5 Added send clipboard finish log 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 2015-05-19 10:54:02 -07:00
Jerry (Xinyu Hou) 6e7b3d87c5 Added changes for StreamChunker that is left from last commit 2015-05-19 09:37:15 -07:00
Jerry (Xinyu Hou) c674642181 Used StreamChunker for clipboard and file transfer
Clipboard is not handled at this point
2015-05-19 09:30:35 -07:00
Nick Bolton 11a7d2c4c2 Stopped Windows plugin loader from throwing
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
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
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
@XinyuHou, when adding hacks, please annotate with a comment
2015-05-19 10:28:02 +01:00
Jerry (Xinyu Hou) 70be9cd97f Refactored intToString 2015-05-18 11:27:54 -07:00
Jerry (Xinyu Hou) af73e8280d Increased protocol version number to 1.6 2015-05-18 11:25:58 -07:00
Nick Bolton 62a501066f Disabled IPC logging tests for Mac and Linux
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 2015-05-18 10:17:22 -07:00
Nick Bolton 9f577ca4f3 Added rate limiting to IPC logging 2015-05-18 18:06:58 +01:00
Nick Bolton b27b236c07 Disabled failing IPC tests for Mac 2015-05-18 16:39:54 +01:00
Nick Bolton 984c5885f7 Fixed Mac build by hacking out mutex close 2015-05-18 16:09:09 +01:00
Jerry (Xinyu Hou) 4c36c08099 Send clipboard data in a thread 2015-05-16 00:06:38 +01:00
Jerry (Xinyu Hou) 44089d55e8 Send clipboard data in small chunks without using thread 2015-05-15 22:28:43 +01:00
Nick Bolton e60b3a6feb Added truncating to IPC log buffer queue
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 2015-05-15 14:44:25 +01:00
Nick Bolton 2e3769c7a6 Added failing test for IpcLogOutputter::write(...)
- 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 2015-05-14 14:39:03 -07:00
Jerry (Xinyu Hou) 220b6befab Used a thread to send clipboard data 2015-05-14 13:51:21 -07:00
Nick Bolton 134a15ea8d Modified IpcServer to be mockable
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
Adam Potolsky 8c82996fc4 Merge pull request from legonigel/master
Rename license to LICENSE closes 
2015-05-08 09:06:06 -07:00
Tom Sparrow 9b87ca3807 Fix missing DLLs after install
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 2015-05-06 16:36:49 +01:00
XinyuHou 932b0f0c55 Fixed GUI doesn't start after install on Windows 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 2015-05-06 14:25:18 +01:00
Jerry (Xinyu Hou) 02bfeff1b2 Merge pull request 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 2015-05-06 12:11:12 +01:00
XinyuHou c168721d2f Added deprecated args handling 2015-05-06 11:57:42 +01:00
Adam Potolsky c3f003bf5b Adding new binary installer locations to make files 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 2015-04-29 11:35:12 -07:00
Adam Potolsky 503a6e26bf Added variable to define location of windows binaries 2015-04-29 10:27:41 -07:00
XinyuHou 4af987e8de Made secure socket logging more user friendly 2015-04-29 13:25:01 +01:00
Adam Potolsky e8b4017960 Changing ns plugin to use new binaries instead of older source directory. 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
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) 2015-04-23 15:37:07 +01:00
XinyuHou fb6186304b Dropped SSLv3 support 2015-04-23 13:02:42 +01:00
XinyuHou decf7ca313 Removed unused dependency 2015-04-23 13:02:42 +01:00
XinyuHou a7848d6cd2 Made comment more clear 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 2015-04-21 17:56:01 +01:00
XinyuHou 018480412a Stopped retry when fatal error happened in secure socket 2015-04-21 16:54:49 +01:00
Xinyu Hou 423d698436 Fixed secure socket using old trusted fingerprint path 2015-04-21 16:46:05 +01:00
Nick Bolton f56d06d95d Disabled auto-hide feature 2015-04-21 16:25:55 +01:00
Nick Bolton d184be31b5 Fixed: SSL dir not created on Mac 2015-04-21 14:48:28 +01:00
Nick Bolton dbc5da7a48 Refactored certificate class (part 2) 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 2015-04-20 19:08:03 +01:00
Nick Bolton f997aea8e7 Moved SSL generate code as is into new class 2015-04-20 18:51:22 +01:00