Commit Graph

769 Commits

Author SHA1 Message Date
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