Commit graph

254 commits

Author SHA1 Message Date
Jerry (Xinyu Hou)
0680c33909 Added file events #4584 2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
4508e10186 Fixed IpcLogOutputterTest #4721 2015-06-03 15:23:33 -07:00
Jerry (Xinyu Hou)
c4e8dc7198 Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-06-02 15:30:33 -07:00
Jerry (Xinyu Hou)
5006adedfe Changed note to notify #4745 2015-06-01 14:46:08 -07:00
Jerry (Xinyu Hou)
bd3a8e9429 Fixed unittest for ipcLogOutputter #4721 2015-05-29 17:48:53 -07:00
Nick Bolton
b71c298163 Changed sleep time to 100ms for unit test (hack) #4651 2015-05-25 15:25:14 +01:00
Jerry (Xinyu Hou)
c22e327eed Merge remote-tracking branch 'origin/master' into jerry-sandbox 2015-05-21 11:37:42 -07:00
Xinyu Hou
49ac320f97 Refactored clipboard event into ClipboardEvent #4601 2015-05-20 19:09:54 +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
Jerry (Xinyu Hou)
2c74a7f5c1 Added stringToSizeType and its unittest #4601 2015-05-19 14:23:43 -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)
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
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
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
Jerry (Xinyu Hou)
44089d55e8 Send clipboard data in small chunks without using thread #4601 2015-05-15 22:28:43 +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
Nick Bolton
134a15ea8d Modified IpcServer to be mockable #4651
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +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
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
XinyuHou
cf6a6bcd48 Removed dead code #4527 2015-04-20 14:57:59 +01:00
XinyuHou
dd574c4f2c Added unit tests for string operations 2015-04-14 17:51:50 +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
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
d80aa7c938 resolve #4337 removed IStreamFilterFactory dead code 2015-01-27 11:33:06 +00:00
XinyuHou
f973d1498d dropped prefix C 2015-01-12 10:33:29 +00: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
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
e26ccfdce6 Parse arg refactoring #4124
Added unit testing
2014-10-22 16:52:08 +01:00
Nick Bolton
d9f90e319e changed synergy-foss.org to synergy-project.org 2014-05-08 07:33:35 +00:00
jerry
45c1cde698 fixed: events were added before event queue was ready, caused debug build assert failure.
removed sleep hack in favour of cond var wait.
2014-04-17 10:56:25 +00:00
Nick Bolton
0745d5884b Task #3969 - Merge String.cpp and StringUtil.cpp 2014-03-21 08:32:36 +00:00
Nick Bolton
e34e39a41c fixed XArchEvalUnix using wrong memeber, string_format using c++11 (which we're not ready for yet), code style (indentation and new lines) 2014-03-20 13:34:21 +00:00
Nick Bolton
41c1319134 removed unused test 2014-03-17 16:37:17 +00:00
Nick Bolton
1b5cdecc60 Task #3960 - Split CMSWindowsHookLibraryLoader into hook and shellex loaders
- reordered include order for winsock2.h (more robust)
- removed Windows.h include from synwinxt.h (not needed)
2014-03-17 14:34:13 +00:00
Nick Bolton
28a6b16875 fixed: Bug #3933 - Plus signs in the email address cause premium login to fail 2014-03-14 20:34:19 +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
ab529fae41 combined windows and unix arch internet test, there can be only one! 2014-03-14 18:32:34 +00:00
Nick Bolton
ad1cdd150a temporarily diabled pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect - causing sigsegv 2014-02-28 16:30:20 +00:00
Nick Bolton
9b9a489efc fixed: tests not compiling on linux 2014-02-28 15:36:51 +00:00
Nick Bolton
f4bb72ce52 fixed:
- (weird) linker error on windows caused by using different include.
- IpcTests using private field which had a public accessor.
- some includes using wrong lib.
2014-02-28 15:04:49 +00:00
Nick Bolton
ad8905ccbf fixed: silenced gtest warning on osx106 2014-02-28 13:56:07 +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
8d6a44d1b7 fixed: osx106 warnings 2014-02-26 15:53:28 +00:00
Nick Bolton
78ecdf4c6e fixed: win32 warnings. 2014-02-25 15:50:06 +00:00
Nick Bolton
c44971b43d fixed: warnings on mac os x 2014-02-25 15:03:43 +00:00
Nick Bolton
bdb4c47898 crypto++, gtest and gmock: ignore external lib warnings, not much we can do about them 2014-02-24 16:32:18 +00:00
Nick Bolton
77676d558e potential fix for unit/integ test false positives 2014-02-24 13:45:43 +00:00
Nick Bolton
ad35ccb2dc disabled all COSXKeyStateTests for osx10.6 2014-02-24 13:04:16 +00:00
Nick Bolton
2c2b136a36 disabled fakeAndPoll_shift for osx10.6 2014-02-24 12:13:51 +00:00
Nick Bolton
75d2c5abf1 fixed: nothing happens on osx 10.6 2014-02-17 19:38:26 +00:00
Nick Bolton
2d0d0010d7 fixed: integ tests - drag drop was disabled. 2014-02-07 12:33:26 +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
Nick Bolton
59cd5ac554 fixed: code style (win) 2014-02-05 16:38:23 +00:00
Nick Bolton
aae76f612a fixed: code style 2014-02-05 16:38:03 +00:00
Nick Bolton
5ca1c17549 native unix http get for premium auth 2014-02-05 14:29:50 +00:00
Nick Bolton
dfe6c3889e fixed: last patch went awry 2014-02-04 19:46:45 +00:00
Nick Bolton
7f08036ff3 native windows http get for premium auth 2014-02-04 19:41:29 +00:00
Nick Bolton
ba78e4b67f disabled CIpcTests and NetworkTests on mac, which are failing intermittently. 2013-09-18 06:52:18 +00:00
Nick Bolton
af04f8b2ef reverted failure test for buildbot. 2013-08-30 18:51:01 +00:00
Nick Bolton
46a33b2d97 fixed: return value from last commit - should be 1, not 0. 2013-08-30 18:39:10 +00:00
Nick Bolton
fcf5940c67 fixed: missing return value from last commit. 2013-08-30 17:53:34 +00:00
Nick Bolton
7b217abe21 temp fail for unit tests to test buildbot failure email 2013-08-30 17:35:37 +00:00
Nick Bolton
d68e472d2f changed sleep hack from 1sec to .2sec to speed up integ tests on build machine (todo: get rid of this hack) 2013-08-30 17:33:35 +00:00
Nick Bolton
93b593f13e hacked osx integ key tests to stop COSXKeyStateTests.fakeAndPoll_charKeyAndModifier from failing 2013-08-30 17:05:52 +00:00
Nick Bolton
024f66e25e fixed unit tests, changed modes to cfb (other modes have been removed). 2013-08-30 15:20:36 +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
012fe6ddd8 - Log out dragging file's directory in Synergy (using COM shell extension)
- Change shell extension dll Main.cpp to synwinxt.cpp
2013-08-23 09:59:31 +00:00
jerry
63487e565d hacked network integ tests, so they only run once on mac. so that nightly build passes (connection failed after about 7 test repeats) 2013-08-06 16:21:22 +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
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
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
18a3db6843 patch by jerry: fixed new event queue on Mac and Linu 2013-06-29 22:02:04 +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
65b8f480e8 fixed: code style in unit test (missing g_) 2013-05-01 15:57:46 +00:00
Nick Bolton
4fffe2dad1 fixed: unit test name did not match compilation unit 2013-05-01 15:54:32 +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
119d4cfa11 fixed: function name conflict on mac 2013-05-01 15:46:15 +00:00
Nick Bolton
bb3dd1611c fixed readWriteIvChanged unit test to match new behaviour of newIv. 2013-04-11 23:45:55 +00:00
Nick Bolton
607f8c9321 fixed: new iv was used before it was sent to the client, so the client could not decrypt new iv. 2013-04-11 22:30:24 +00:00
Nick Bolton
bae07f8cd5 test for generating keys from longer passwords. 2013-04-11 21:52:45 +00:00
Nick Bolton
e84f111f35 changed unit test IVs so that \0 isn't used (logs look less confusing). 2013-04-11 06:16:15 +00:00
Nick Bolton
1dccfe6c53 fixed: real server dtor being called (we forgot to set m_mock - FUUUUUUUU). also added quick and dirty backtrace for osx, since we keep accidentally calling that singleton in unit tests... could be handy, we should consider refactoring into a func maybe. 2013-04-11 05:50:59 +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
650da22c33 fixed buffer overrun bugs in unit tests. 2013-04-10 17:30:21 +00:00
Nick Bolton
72cbcd70c0 fixed unit tests, buffer indexes were not reset, caused tests to fail on 2nd repeat. 2013-04-10 12:14:59 +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
b2746bc1b2 added unit test to make sure IV works as we expect. 2013-04-08 13:01:21 +00:00
Nick Bolton
0a69c28ac5 implemented crypto stream, with some extra unit tests 2013-04-05 16:33:48 +00:00
Nick Bolton
3aaebd9e50 Patch by Jerry:
* wrote CCryptoStream and supporting unit tests
* changed CStreamFilter to accept CMockEventQueue
* changed CStreamFilter's dtor to virtual because it is inherited
2013-04-04 16:17:25 +00:00
Nick Bolton
7040905632 crypto++ -- upgraded to 5.6.2 and added zip to svn instead of individual source files (easier to manage). also added unit test to prove that linking works well on windows. 2013-04-03 12:59:02 +00:00
Nick Bolton
c8ea071d78 comment out crypto stuff, for now (only compiles on windows) 2013-01-05 22:50:34 +00:00
Nick Bolton
a11b68c988 uncommented crypto tests and fixed line endings 2012-11-30 01:07:04 +00:00
Nick Bolton
13c10cbad3 fixed: line endings 2012-11-30 01:00:40 +00:00
Nick Bolton
b322ade68c fixed: rogue include 2012-11-29 23:50:03 +00:00
Nick Bolton
bd6b9f6b90 added crypto++ library and example authenticated encryption unit test (CCryptoTests) 2012-11-29 23:27:02 +00:00
Nick Bolton
21b02d708f disabled broken integ tests 2012-10-29 14:15:14 +00:00
Nick Bolton
bdb0e6667a added missing new integ test file 2012-10-29 13:52:26 +00:00
Nick Bolton
69db341660 added cursor show/hide test, and modified osx screen class to be more robust with memory usage. also fixed some bad code style. 2012-10-28 11:36:30 +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
e7f5d0dbf3 Bug #3303 - Mac OS X IPC integ test fails intermittently 2012-07-29 02:41:49 +00:00
Nick Bolton
86bb49aeae added feature to control uac elevation on desk switch (login screen, lock, etc) 2012-07-28 13:34:35 +00:00
Nick Bolton
268f3a99bb added process elevation support to the relauncher, very experimental, has some bugs. 2012-07-28 02:59:20 +00:00
Nick Bolton
3e1919f976 fixed osx key tests -- wrong shift button code ae and only left shift was tested 2012-07-25 00:57:26 +00:00
Nick Bolton
41b5759e00 commented out failing test 2012-07-25 00:49:58 +00:00
Nick Bolton
e2f8e65298 added working key tests on osx 2012-07-24 22:08:38 +00:00
Nick Bolton
de30d04c72 added failing unit test and event queue DI to ms desks class. 2012-07-20 12:24:55 +00:00
Nick Bolton
131aa190c3 increased ipc test timeout, mac os x 10.8 seems slow to open tcp sockets. 2012-07-13 18:15:31 +00:00
Nick Bolton
eca240eec7 changed integ tests to use another port for ipc. 2012-07-11 12:07:13 +00:00
Nick Bolton
f26e7b0d97 fixed unit tests (log not initialized) 2012-07-10 13:55:05 +00:00
Nick Bolton
f9f04034c9 fixed: ipc client running on synergyc wasn't sending hello message, and so wasn't getting shutdown message. edits to CIpcClient or CIpcTests weren't really needed, but looks slightly better this way maybe. 2012-07-10 11:23:08 +00:00
Nick Bolton
8bad45e8a2 * fixed a shit-ton of memory leaks (lots in the ipc log handler, oops)
* added non-pod data support to events (event delete can now call dtors)
* improved cleanup of ipc message objects (because of non-pod event data support)
* moved the "message received" event up to ipc server and client (passed on from proxies)
2012-07-10 01:51:51 +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
7d5fbde71d fully replaced gui/daemon named pipes ipc with tcp ipc. 2012-07-03 14:15:05 +00:00
Nick Bolton
79d73bd163 ipc send message to client finished. 2012-07-02 15:28:23 +00:00
Nick Bolton
97b2cd669d finished ipc send to server. 2012-07-02 13:45:52 +00:00
Nick Bolton
05775bc73d finished ipc connect with unit test. 2012-07-01 21:18:21 +00:00
Nick Bolton
218e98398f ipc client connect test with working unit tests. 2012-06-29 11:33:21 +00:00
Nick Bolton
7d8fd5927d skeleton for new ipc code. 2012-06-28 07:29:06 +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
9104860863 merged 1.3 r1048:1049 into 1.4 and trunk 2011-06-19 00:28:22 +00:00
Nick Bolton
baaa240a8c merged 1.4 r1046:1047 into trunk 2011-06-18 23:59:09 +00:00
Nick Bolton
2fe11744cf merged 1.4 r1043:1044 into trunk 2011-06-18 23:44:23 +00:00
Nick Bolton
5a315324ca merged 1.4 r1007:1008 into trunk 2011-05-21 00:30:08 +00:00
Nick Bolton
5b0bc93b00 merged 1.3 r989:990 into trunk and 1.4 2011-05-12 22:37:57 +00:00
Nick Bolton
81b5124e58 merged 1.3 r985:986 into trunk and 1.4 2011-05-11 21:12:20 +00:00
Nick Bolton
901d939267 removed more windwows line endings 2011-05-11 21:07:22 +00:00
Nick Bolton
13c6c36107 merged 1.4 r982:983 into trunk 2011-05-09 00:28:45 +00:00
Nick Bolton
edeae477e1 implemented google mock config and gave it a quick try (see: add_newValue_writeWasCalled) 2011-05-07 02:12:09 +00:00
Nick Bolton
3442cbc707 Task #2933 - *nix side of task (used lock file approach) 2011-05-06 22:58:12 +00:00
Nick Bolton
933522451a win32: Task #2933 Prevent multiple integ tests from running in parallel (had to expose some arch misc windows functions) 2011-05-06 21:13:07 +00:00
Nick Bolton
8ea964c331 made win clipboard integ test start and end with empty clipboard 2011-05-03 19:45:40 +00:00
Nick Bolton
0e94f696fa comment out another intermittently failing integ test 2011-05-01 19:31:10 +00:00