smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6392 commits 2 branches 0 tags 101 MiB
Commit graph

223 commits

Author SHA1 Message Date
Andrew Nelless
0cd45ba1ef Remove unused include paths 2017-03-09 14:18:39 +00:00
Andrew Nelless
4263fd1717 Rename synergy library to synlib to work around conflict with GUI 2017-02-08 15:11:21 +00:00
XinyuHou
deea23f866 Apply tab to spaces filter to src folder 2017-02-07 01:24:59 +00:00
Andrew Nelless
f3d1470e58 Brutally replace all reinterpret_casts with static_casts 2016-10-05 12:46:16 +01:00
Andrew Nelless
45da1dfc7c #5628 Make enableCrypto directly enable SSL 2016-09-29 13:11:09 +01:00
Andrew Nelless
0d84e4eed6 #5617 Make PacketStreamFilter adopt all socket types 2016-09-29 13:11:09 +01:00
Andrew Nelless
77d6b83b0c #5617 Remove stray PluginVersion includes 2016-09-29 13:05:04 +01:00
Andrew Nelless
5774f5a291 #5617 Remove plugin infra from Client 2016-09-29 13:05:03 +01:00
Xinyu Hou
a17779e7fd #123 Disabled clipboard grab mechanism when clipboard is disabled 2016-09-26 11:58:33 +01:00
Xinyu Hou
ce4effa2c8 #123 Fixed warning on Linux 2016-09-26 11:58:33 +01:00
Xinyu Hou
eafc548b97 #123 Made disable clipboard take effect on client 2016-09-26 11:58:33 +01:00
Xinyu Hou
3c94310c9e #123 Read clipboard sharing option and pass it to all clients 2016-09-26 11:58:33 +01:00
XinyuHou
a471bdcea7 Made a own copy of ClientArgs in Client 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
e1be67cfb6 Fixed indentations 
Conflicts:
	src/lib/client/Client.h
 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
95464d97cf Conflicts: 
src/lib/client/Client.cpp
	src/lib/net/TCPSocketFactory.cpp
 2016-09-26 11:58:33 +01:00
XinyuHou
4ad2c6b10d #4740 Moved clipboard transfering back into main thread on client 2016-09-26 11:58:33 +01:00
XinyuHou
3e1a86c3c1 #5502 Reverted disabled sending clipboard on inactive grab 
This reverts commit 2ad4b896f3.
 2016-09-26 11:58:33 +01:00
Andrew Nelless
c3c0913633 Update company copyright notice 2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
2ad4b896f3 #4768 Disabled sending clipboard on inactive grab 2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
1a76acd446 #4768 Interrupted both clipboards 2016-08-08 14:36:42 +01:00
Jerry (Xinyu Hou)
7cbd3fdcb4 Revert "Add keepAlive message before send file/clipboard data #4768" 
This reverts commit 5287c62540b277474603ea8a38c53b50cb8f4d52.
 2016-03-15 12:57:39 -07:00
Jerry (Xinyu Hou)
b5b2cdfade Add keepAlive message before send file/clipboard data #4768 2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
6d0f820db5 Fix indentations 2016-03-15 12:57:05 -07:00
Nye Liu
8f0530c507 Add retry to CondVarBase wait(), make sure Stopwatch is started on construction (Issue #4735) 
* ArchMultithreadPosix::waitCondVar() returns every 100ms, so retry until we
  hit timeout.

* Stopwatch constructor should be called with "false" (not "true") to make sure
  Stopwatch is actually running when instantiated.
 2016-03-15 12:46:45 -07:00
Nye Liu
1fde0f3e71 Cosmetic whitespace, use return value of wait() directly instead of testing timer 2016-03-15 12:46:45 -07:00
Nye Liu
0d310a8464 Properly lock condVar, add timeout condition to prevent infinite loop when waiting for fillClipboard() to finish 2016-03-15 12:46:45 -07:00
Nye Liu
6c11de6a22 Fix bug #4735 - don't leave() until fillClipboard()s all complete 2016-03-15 12:46:45 -07:00
Jerry (Xinyu Hou)
945ccfdb75 Refactored plugin names #4866 2015-08-03 15:56:21 -07:00
Xinyu Hou
b105bc8f42 Unified secure socket name across platforms #4866 2015-08-03 15:56:03 -07:00
Jerry (Xinyu Hou)
7259e71439 Reset thread back to null on finish #4712 2015-07-31 13:55:35 -07:00
Jerry (Xinyu Hou)
a44e9832c5 Refactored code order to make it more readable 2015-07-31 13:46:23 -07:00
Jerry (Xinyu Hou)
9800bec857 Made clipboard log more consistent #4712 2015-07-31 13:46:11 -07:00
Jerry (Xinyu Hou)
4fe46e117e Shorten data transfer log #4858 2015-07-31 13:20:50 -07:00
Jerry (Xinyu Hou)
81649376fa Revert "Added symbolic link creation to linux and macos #4696" 
This reverts commit ad9cfd64af.

Conflicts:
	src/gui/src/PluginManager.cpp
 2015-07-31 13:20:16 -07:00
Jerry (Xinyu Hou)
69a6038cf9 Revert "Moved note into either warning or info #4745" 
This reverts commit d3a4ce1f11.
 2015-07-31 13:18:57 -07:00
Xinyu Hou
85dc7a566e Made log consistent #4745 2015-06-30 03:37:36 +01:00
Jerry (Xinyu Hou)
72060e59b4 Fixed send clipboard thread time issue #4749 2015-06-12 11:21:05 -07:00
Jerry (Xinyu Hou)
5c71efebe6 Fixed integtests #4584 2015-06-05 15:23:44 -07:00
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
eb3f8aee2a Notified file transmission interrupted #4745 2015-06-04 14:43:49 -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)
8d0fdee5ce Added full stop for notification #4745 2015-06-02 11:18:21 -07:00
Jerry (Xinyu Hou)
d9921c894c Added clipboard transmission notification #4745 2015-06-02 09:48:26 -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
Jerry (Xinyu Hou)
e7f358afb2 Added file transmission started, failed and complete notification #4745 2015-06-01 15:33:06 -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)
4a27c0b05c Added drop file notification on client #4745 2015-06-01 11:57:43 -07:00
Xinyu Hou
fb3252efef Added a way to interrupt sending clipboard/file #4601 2015-05-23 00:34:00 +01:00
Jerry (Xinyu Hou)
a81b88c730 Refactored file assemble and send code #4601 2015-05-22 11:27:57 -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
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
Jerry (Xinyu Hou)
a6dfbbe021 Validated received clipboard data size #4601 2015-05-19 14:28:38 -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
Jerry (Xinyu Hou)
30f96b9fbb Renamed FileChunker to StreamChunker #4601 2015-05-18 10:17:22 -07:00
Jerry (Xinyu Hou)
44089d55e8 Send clipboard data in small chunks without using thread #4601 2015-05-15 22:28:43 +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
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
407f92e9d4 Removed --certificate-fingerprint argument #4522 
Used profile dir for fingerprint file path instead
 2015-04-15 14:16:28 +01:00
Xinyu Hou
1e2b822226 Removed unused variable 2015-04-14 17:52:24 +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
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
a6b5c872f5 Rephrased "crypto disabled" log, changed to error #4313 2015-03-04 09:00:01 +00:00
XinyuHou
c4c0fc8a08 added enable crypto argument to synergys/c #4313 2015-02-12 15:50:08 +00:00
XinyuHou
80343c41eb deleted old home brew crypto #4313 2015-02-11 11:12:54 +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
10cddb97a8 fixed misused read and write #4313 2015-01-26 13:23:11 +00:00
Xinyu Hou
141b778477 refactored SecureSocket to use interface #4313 2015-01-14 17:25:53 +00:00
XinyuHou
1d7eb3f5cb updated pluging loader for Windows #4313 2015-01-09 13:46:35 +00:00
the-wes
a99bea9d3b clarify protocol error message 2014-12-05 16:59:39 -08:00
Xinyu Hou
67377109f3 Moved Screen class into synergy namespace 2014-11-11 17:45:24 +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
jerry
f87bd9e860 - checked filename's validation before sending drag info 
- refactored duplicated write to drop dir code
- removed legacy member variables
- fixed code style
- fixed typo
 2014-05-14 14:45:15 +00:00
jerry
9621cba99e - redesigned drag information protocol 
- used DragInformation to encapsulate information and helper functions.
- renamed parameters in sendDragInfo function.
 2014-05-06 18:26:47 +00:00
jerry
ff42afc36c made drag info function name more consistent 2014-05-01 13:56:07 +00:00
jerry
f773ff3d00 refactored duplicated code in dragInfoReceived 
refactored fakeDraggigFiles interface
 2014-04-30 18:54:32 +00:00
Nick Bolton
407378fbc5 Task #3951 - Clear filename stored in synwinxt on mouse up 
- renamed some functions for file drag/drop to be more similar to existing
- improved log messages for the library loader
- removed hack that blocked .exe and .lnk files (annoying for developers)
- removed hack that always clears dragging filename (not very robust)
 2014-03-17 13:10:29 +00:00
Nick Bolton
f62cac6a0a code style - indentation 2014-03-17 11:16:52 +00:00
Nick Bolton
d5b25069be fixed: extending std::runtime_error instead, as std::exception ctor is undefined. also fixed some mac warnings from inheriting runtime_error. 2014-03-14 20:33:18 +00:00
Nick Bolton
4675f29a4c code style fixes: 
- reordered includes to prevent accidental dependencies.
- moved arch specific files into their own folder (easier to include with cmake).
- renamed non-class files to reflect new code style (lower case with underscores).
- using full relative paths for includes (easier for understanding dependencies).
- using #pragma once instead of classic-style header guards.
 2014-02-28 12:36:45 +00:00
Nick Bolton
8e74710dad code style: dropped C prefix 2014-02-27 17:45:17 +00:00
Nick Bolton
f11c660efb used glob instead of manually specifying files. cmake does not recommend this, but we always re-run cmake anyway after adding files since we use vs. 2014-02-26 17:46:02 +00:00
Nick Bolton
50a4f310c9 moved tools to ext - makes more sense, as it contains external libs, not tools 2014-02-26 16:52:54 +00:00
Nick Bolton
78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton
d03b398bc1 - improved string conversion by using ms comutil. 
- removed dead member variable.
- extra logging to help debug file drop on windows.
 2014-02-07 17:06:26 +00:00
Nick Bolton
deff54f051 fixed: accidentally nerfed drag and drop. 2014-02-07 11:30:48 +00:00
Nick Bolton
f149101d25 fixed: linux client crashes on file drop, even though drag and drop is disabled 2014-02-06 18:39:12 +00:00
jerry
6e50945bf9 created a new thread to write file to drop directory on client side 2013-09-25 14:49:04 +00:00
jerry
4e09b06cb0 fixed drag drop from Mac server to Windows client 2013-09-18 14:12:19 +00:00
jerry
340e31298e - removed --filetransfer-src and --filetransfer-des args. 
- on Window, temporarily use user desktop directory as drop target.
 2013-09-17 18:13:58 +00:00
jerry
dbc7659776 changed the transparency of the window where drag is from on mac. 2013-09-12 11:43:34 +00:00
jerry
43e2535335 Feature to drag a file from Mac (client) to Windows (server): 
- temporarily drop dragging file to desktop (specified by command line arg --filetransfer-des)
- on Mac side, fake an esc key while dragging off the screen does not seem to work
 2013-08-30 19:49:38 +00:00
jerry
ce1b62db14 Feature to drag a file from Windows to Mac: 
- On Mac client main thread is used for cocoa application in order to simulate drag.
- Send dragging file dir from Windows server to Mac client while dragging after switching screen.
- Dragging information sending is immature now (need to support multi files dragging in the future).
- Used Cocoa function to monitor dragg pasteboard.
- Changed Mac client to use another thread for event queue instead of the main thread.
- Change fileRecieveComplete to fileRecieveCompleted.
 2013-08-30 14:38:43 +00:00
jerry
031a84ca84 - Allow dragging one file from Windows (server) to Mac (client), --filetransfer-des needs to be specified in client side's command line. 2013-08-23 15:36:23 +00:00
jerry
587c320f61 - Added data handler shell extension project (synwinxt) which will output a dll file. 
- Removed misused comments in CServerProxy
 2013-08-21 13:30:46 +00:00
jerry
dab838ed14 - renamed synrgyhk.dll to synwinhk.dll and moved lib code to separate folder. 
- removed game device support (fallen into significant disrepair).
 2013-08-02 13:21:06 +00:00
Nick Bolton
289f1ff71f Patch by Jerry: 
- Added fixed pause between raising each file transfer event
- Removed redundant member variables in CClient and CServer
 2013-07-26 14:10:06 +00:00
Nick Bolton
811cfd146d Patch by Jerry: 
- Measure file transfer speed
- Increased quit timeout in NetworkTests
- Some code duplication, to be fixed in future patch
 2013-07-26 12:44:14 +00:00
Nick Bolton
99a7e0db23 Patch by Jerry: 
- Added include path for std::runtime_error
 2013-07-26 10:26:20 +00:00
Nick Bolton
394ece004a Patch by Jerry: 
- Fixed line endings
- Integ test for file transfer
- Fixed crashed problem when log info is larger than 2048 bytes
- Fixed compile error caused by std exception (by Feng ye)
- Fixed include path on Mac and linux (by Feng ye)
 2013-07-24 16:41:12 +00:00
Nick Bolton
c368013f13 Patch by Jerry for issue 46: 
- Unit test for sending file data from server to client.
- Removed singleton pattern from CSocketMultiplexer for easier unit testing.
- Incremented protocol version from 1.4 to 1.5 (new file chunk message).
- Storing pointer to CConfig instead of copying in CServer (so we can mock it).
- Created a common event queue for testing (timeout, quit event, etc).
- Fixed code style.
 2013-07-16 19:02:30 +00:00
Nick Bolton
608074c041 - made unit testing easier by (mostly) removing the event queue singleton. 
- fixed code style in many places (mostly indentation).
 2013-06-29 14:17:49 +00:00
Nick Bolton
e8ed977a8f fixed: issue 3565 - encryption fails with heavy network traffic. 
changed encrypt and decrypt to be asymmetrical (iv change now applies only in one direction).
 2013-05-01 15:53:22 +00:00
Nick Bolton
c0dcdd52e7 fixed: crypto++ compile errors, linux compiler syntax bugs, and code style (spaces -> tabs) 2013-04-11 00:30:41 +00:00
Nick Bolton
880819fab7 Jerry's patch for password hash and custom mode (via command line). 2013-04-09 21:57:07 +00:00
Nick Bolton
7010de9cc4 sending IV to client before DKDN, DKUP and DKRP (the most sensitive messages). unit tests to support changes. made crypto stream tests a bit less spammy by using NiceMock. 2013-04-09 18:56:19 +00:00
Nick Bolton
23998fc06c unit tests for IV change. 2013-04-08 18:35:23 +00:00
Nick Bolton
323285a931 moved temp hard coded key out of crypto class. 2013-04-08 13:04:20 +00:00
Nick Bolton
0a69c28ac5 implemented crypto stream, with some extra unit tests 2013-04-05 16:33:48 +00:00
Nick Bolton
7f6eca9eb4 corrected license and author attribution (cs 2002-2012, nb 2008-2012) 2012-09-04 02:09:56 +00:00
Nick Bolton
3d6551f708 moved stream into synergy namespace (to prevent naming collision in win libs) 
implemented ipc "hello" message (to identify client type)
integ tests working for hello message, but use of ipc in main program has problem with events.
 2012-07-05 18:05:35 +00:00
Nick Bolton
488241850c moving 1.4 to trunk 2012-06-10 16:50:54 +00:00
Nick Bolton
e65886857d removed trunk; please commit to (and build patches against) release branches instead. 2011-10-05 00:10:22 +00:00
Nick Bolton
5a315324ca merged 1.4 r1007:1008 into trunk 2011-05-21 00:30:08 +00:00
Nick Bolton
8472fec34d removed 'lib' prefix from libraries (cmake does this for us automatically on UNIX) 2011-04-25 22:21:32 +00:00
Nick Bolton
66c4bdc356 fixed library linkage on linux 2011-04-25 22:10:46 +00:00
Nick Bolton
143c4cd297 restructured source code, put CMakeLists.txt in more conventional locations, and split the libraries up 2011-04-25 21:09:32 +00:00