Xinyu Hou
5cbcd74028
Fixed using NOTE level logging on Mac #4745
2015-06-01 23:42:58 +01: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)
5006adedfe
Changed note to notify #4745
2015-06-01 14:46:08 -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)
ecf0485e8f
Removed commented out code #4745
2015-06-01 12:39:30 -07:00
Jerry (Xinyu Hou)
4a27c0b05c
Added drop file notification on client #4745
2015-06-01 11:57:43 -07:00
Jerry (Xinyu Hou)
bd3a8e9429
Fixed unittest for ipcLogOutputter #4721
2015-05-29 17:48:53 -07:00
Jerry (Xinyu Hou)
97bac70fae
Stop writing into and clear buffer when no GUI #4721
2015-05-29 16:55:22 -07:00
Adam Potolsky
4bf1eeb065
Removed unnecessary method and static data #4696
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 #4696
2015-05-29 16:20:47 -07:00
Adam Potolsky
8d70075171
Replaces plugin download with install and copy functionality #4696
2015-05-29 15:57:21 -07:00
Jerry (Xinyu Hou)
9487db1672
Merge pull request #4722 from maximd/master
...
Fix issue synergy/synergy#4720
2015-05-28 16:58:44 -07:00
Jerry (Xinyu Hou)
d7063a87c8
Fixed using wrong local variable #4723
2015-05-27 10:32:13 -07:00
Jerry (Xinyu Hou)
aec52c36e6
Added timeout for waiting active destop result #4723
2015-05-27 10:18:45 -07:00
Jerry (Xinyu Hou)
3498d1bc8e
Used synergy::string::sprintf instead of append #4690
2015-05-27 09:52:58 -07:00
Maxim Doucet
03fc9b5fa7
Fix issue synergy/synergy#4720
2015-05-27 18:34:47 +02:00
Jerry (Xinyu Hou)
d83cb23cc7
Reverted 8b9758 #4712
2015-05-26 17:25:18 -07:00
Jerry (Xinyu Hou)
907b02fb09
Used log system instead of stdout (part 2) #4690
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 #4690
2015-05-26 17:12:58 -07:00
Jerry (Xinyu Hou)
dba46707b2
Removed SSL chunk size limitation #4712
2015-05-26 13:31:15 -07:00
Nick Bolton
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
Nick Bolton
fd72bf17ce
Reworded SSL errors to be more consistent #4650
2015-05-26 14:17:30 +01:00
Nick Bolton
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
Nick Bolton
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
Nick Bolton
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
Nick Bolton
4aa57cfbdb
Fixed code style, more consistent logging #4650
2015-05-25 20:24:29 +01:00
Nick Bolton
1cea4bb80f
Fixed code style, use lower case for logging #4650
2015-05-25 20:20:12 +01:00
Nick Bolton
0fdcfe9b95
Fixed code style, prefer enums over macros #4650
2015-05-25 20:20:12 +01:00
Nick Bolton
3563217c7b
Fixed Mac package platform variable name #4708
2015-05-25 19:54:34 +01:00
Nick Bolton
590d0482b3
Removed useless processor type return for Mac #4708
2015-05-25 19:54:21 +01:00
Nick Bolton
e8a43dd020
Simplified logic to detect Linux 64/32 deb/rpm #4565
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 #4708
2015-05-25 18:59:58 +01:00
Nick Bolton
14bb44f539
Comment explaining lack of 10.7 support #4695
2015-05-25 17:41:38 +01:00
Nick Bolton
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
Nick Bolton
a900543c1d
Allowed Mac OS X 10.7 to build ns plugin #4695
2015-05-25 16:53:46 +01:00
Nick Bolton
b71c298163
Changed sleep time to 100ms for unit test (hack) #4651
2015-05-25 15:25:14 +01:00
Nick Bolton
18344e6b52
Copy ns plugin to debug dir when in debug mode #4704
2015-05-25 13:08:47 +01:00
Nick Bolton
f322a79760
Copy plugins to config dir on Mac #4703
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 #4601
2015-05-23 00:34:00 +01:00
Adam Potolsky
905dbfee90
Fixed order of initializers for mac build #4697
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 #4697
2015-05-22 16:09:59 -07:00
Jerry (Xinyu Hou)
ff9ad5554a
Used different chunk size for SSL and non-SSL socket #4601
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 #4601
2015-05-22 11:27:57 -07:00
Adam Potolsky
7b718dc586
Forgot to change linux specific variable name #4697
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 #4697
...
Added code to cleanly terminate connection on fatal socket state #4697
2015-05-22 10:56:13 -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
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 #4601
2015-05-21 15:34:28 -07:00
Adam Potolsky
e4f86a8934
Adding pass/fail retry logic to connection attempts #4697 #4650
2015-05-21 15:22:39 -07:00
Jerry (Xinyu Hou)
8b49eb6595
Removed unused function #4601
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 #4529
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 #4650
2015-05-20 16:54:42 -07:00
Jerry (Xinyu Hou)
7dbe30cb61
Fixed Linux uses wrong clipboard event #4601
2015-05-20 14:43:58 -07:00
Adam Potolsky
ad86041433
Added code to test for and error out of max retry condition #4650
2015-05-20 14:27:25 -07:00
Adam Potolsky
1af9d58a9b
Changed conditional to match coding standard #4650
2015-05-20 14:14:30 -07:00
Adam Potolsky
81a70135bd
Added concept of a max retry count to SecureSocket class #4650
2015-05-20 13:50:18 -07:00
Adam Potolsky
994a9433fe
Converting retry to a counter #4650
2015-05-20 12:08:25 -07:00
Xinyu Hou
3e9fc89d96
Modified server to use correct clipboard format #4601
2015-05-20 19:54:56 +01: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
Nick Bolton
950219b39e
Fixed init order warning on Mac #4624
2015-05-20 17:51:52 +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
Nick Bolton
f1af62927e
Stopped Unix plugin loader from throwing #4661
...
Tested on Mac OS X only
2015-05-20 15:24:10 +01:00
Jerry (Xinyu Hou)
a6dfbbe021
Validated received clipboard data size #4601
2015-05-19 14:28:38 -07:00
Jerry (Xinyu Hou)
2c74a7f5c1
Added stringToSizeType and its unittest #4601
2015-05-19 14:23:43 -07:00
Jerry (Xinyu Hou)
c032091dd5
Added send clipboard finish log #4601
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 #4601
2015-05-19 10:54:02 -07:00
Jerry (Xinyu Hou)
6e7b3d87c5
Added changes for StreamChunker that is left from last commit #4601
2015-05-19 09:37:15 -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
11a7d2c4c2
Stopped Windows plugin loader from throwing #4661
...
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 #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
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
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
Jerry (Xinyu Hou)
70be9cd97f
Refactored intToString #4601
2015-05-18 11:27:54 -07:00
Jerry (Xinyu Hou)
af73e8280d
Increased protocol version number to 1.6 #4601
2015-05-18 11:25:58 -07: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
Nick Bolton
984c5885f7
Fixed Mac build by hacking out mutex close #4651
2015-05-18 16:09:09 +01:00
Jerry (Xinyu Hou)
4c36c08099
Send clipboard data in a thread #4601
2015-05-16 00:06:38 +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
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
Nick Bolton
aac59fbf7e
File missing from last commit #4651
2015-05-15 14:44:25 +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
Jerry (Xinyu Hou)
08aee6cba7
Fixed cast error from pointer to small type on Unix #4601
2015-05-14 14:39:03 -07:00
Jerry (Xinyu Hou)
220b6befab
Used a thread to send clipboard data #4601
2015-05-14 13:51:21 -07:00
Nick Bolton
134a15ea8d
Modified IpcServer to be mockable #4651
...
Also started IpcLogOutputterTests
2015-05-14 18:01:39 +01:00
Adam Potolsky
8c82996fc4
Merge pull request #4608 from legonigel/master
...
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07:00
Tom Sparrow
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
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 #4581
2015-05-06 16:36:49 +01:00
XinyuHou
932b0f0c55
Fixed GUI doesn't start after install on Windows #4607
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 #4596
2015-05-06 14:25:18 +01:00
Jerry (Xinyu Hou)
02bfeff1b2
Merge pull request #4596 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 #4570
2015-05-06 12:11:12 +01:00
XinyuHou
c168721d2f
Added deprecated args handling #4570
2015-05-06 11:57:42 +01:00
Adam Potolsky
c3f003bf5b
Adding new binary installer locations to make files #4587
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 #4587
2015-04-29 11:35:12 -07:00
Adam Potolsky
503a6e26bf
Added variable to define location of windows binaries #4587
2015-04-29 10:27:41 -07:00
XinyuHou
4af987e8de
Made secure socket logging more user friendly #4558
2015-04-29 13:25:01 +01:00
Adam Potolsky
e8b4017960
Changing ns plugin to use new binaries instead of older source directory. #4587
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 #4569
...
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) #4569
2015-04-23 15:37:07 +01:00
XinyuHou
fb6186304b
Dropped SSLv3 support #4567
2015-04-23 13:02:42 +01:00
XinyuHou
decf7ca313
Removed unused dependency #4520
2015-04-23 13:02:42 +01:00
XinyuHou
a7848d6cd2
Made comment more clear #4567
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 #4557
2015-04-21 17:56:01 +01:00
XinyuHou
018480412a
Stopped retry when fatal error happened in secure socket #4553
2015-04-21 16:54:49 +01:00
Xinyu Hou
423d698436
Fixed secure socket using old trusted fingerprint path #4525
2015-04-21 16:46:05 +01:00
Nick Bolton
f56d06d95d
Disabled auto-hide feature #4390
2015-04-21 16:25:55 +01:00
Nick Bolton
d184be31b5
Fixed: SSL dir not created on Mac #4551
2015-04-21 14:48:28 +01:00
Nick Bolton
dbc5da7a48
Refactored certificate class (part 2) #4549
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 #4525
2015-04-20 19:08:03 +01:00
Nick Bolton
f997aea8e7
Moved SSL generate code as is into new class #4549
2015-04-20 18:51:22 +01:00
Nick Bolton
2a2d095527
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-20 16:53:34 +01:00
Nick Bolton
aa9504f43e
Changed filenames in app data directory #4525
...
- Changed `ssl` to `SSL`
- Moved pem file to `SSL`
2015-04-20 16:40:50 +01:00
Nick Bolton
97060d9698
Removed unused SSL download code #4546
2015-04-20 16:31:36 +01:00
Nick Bolton
a649a0e3df
Reduced code duplication in fingerprint logic #4548
2015-04-20 16:28:26 +01:00
XinyuHou
5e2b8a5048
Fixed #4537 by add file error checking
2015-04-20 16:16:53 +01:00
Nick Bolton
80fd3cc01b
Refactored fingerprint file path logic #4525
2015-04-20 15:58:11 +01:00
Nick Bolton
36a6bb9218
Removed OpenSSL download from plugin manager #4546
2015-04-20 15:27:24 +01: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
453638fa39
Added OpenSSL component to installer #4546
2015-04-20 14:35:52 +01:00
XinyuHou
365d16c94b
Added more status details #4537
2015-04-17 16:33:43 +01:00
XinyuHou
586a893201
Made retry secure write/read use the exactly last parameters #4539
2015-04-17 14:01:35 +01:00
XinyuHou
951cbe9a62
Enable network security checkbox only when ns plugin exists #4540
2015-04-16 17:15:58 +01:00
XinyuHou
59d013ac6a
Show fingerprint only when file exists #4526
2015-04-16 17:12:42 +01:00
XinyuHou
88538e5ee6
Resolve #4526 added local fingerprint in server GUI
2015-04-16 15:10:33 +01:00
XinyuHou
7ab1081b3f
Fixed server crash caused by double delete a socket #4535
2015-04-16 11:55:05 +01:00
Nick Bolton
7c6561b3da
Fixed #4528 - invalid/misleading log line
2015-04-15 15:17:30 +01:00
Nick Bolton
14bf90264e
Renamed function, was reserved keyword on Mac #4522
2015-04-15 14:49:05 +01:00
Nick Bolton
c7de2da062
Comment out unused fingerprint filename consts #4522
...
Causing compile to fail on Mac (fails on warnings)
2015-04-15 14:33:26 +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
Nick Bolton
6580ad0015
Merge branch 'master' of https://github.com/synergy/synergy
2015-04-15 13:40:55 +01:00
XinyuHou
2752d24dc4
Merge branch 'jerry-sandbox'
2015-04-15 13:33:39 +01:00
Xinyu Hou
e405ec25e3
Always log out server fingerprint #4522
2015-04-15 13:25:18 +01:00
Nick Bolton
689737ee7a
Fingerprint file check and trust logic #4522
...
Also refactored the 'get profile dir' code to use the core interface
(reduce code duplication)
2015-04-15 13:09:22 +01:00
Xinyu Hou
52d9b1beed
Logged out new fingerprint when not match #4522
2015-04-15 13:06:49 +01:00
Xinyu Hou
1e2b822226
Removed unused variable
2015-04-14 17:52:24 +01:00
XinyuHou
fa1ea0022b
Fixed code style
2015-04-14 17:52:15 +01:00
XinyuHou
f60e98c8cd
Fixed error from merge
2015-04-14 17:52:08 +01:00
XinyuHou
916a4c75af
Refactored no or wrong ssl certificate error handling #4410
...
Conflicts:
src/lib/net/TCPListenSocket.cpp
src/lib/plugin/ns/SecureListenSocket.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
2015-04-14 17:52:00 +01:00
XinyuHou
dd574c4f2c
Added unit tests for string operations
2015-04-14 17:51:50 +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
Xinyu Hou
39e183da3e
Refactored string operations
...
Conflicts:
src/lib/base/String.cpp
2015-04-14 17:51:19 +01:00
XinyuHou
cb0f0dd06d
Improved fingerprint verification #4522
...
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
src/lib/plugin/ns/SecureSocket.h
src/lib/synergy/ClientApp.cpp
2015-04-14 17:50:49 +01:00
XinyuHou
b24eb2b724
Removed test string #4522
2015-04-14 17:50:36 +01:00
XinyuHou
71dc472a64
Fixed code style
2015-04-14 17:49:56 +01:00
XinyuHou
b8ba37b4f4
Made callback function global #4522
2015-04-14 17:49:33 +01:00
Xinyu Hou
5dfe4aa0b5
Added verification of server certificate fingerprint #4522
...
Conflicts:
src/lib/mt/Thread.cpp
src/lib/plugin/ns/SecureSocket.cpp
src/lib/synergy/ClientArgs.cpp
2015-04-14 17:46:58 +01:00
Nick Bolton
07b1ea203f
Message box asking user to verify fingerprint #4522
2015-04-14 17:29:08 +01:00
Nick Bolton
6e2ccb8f8d
Merge pull request #4422 from legonigel/shortcut_fix
...
Changed server shortcut on GUI main window
Fixes #4367
2015-03-28 08:56:36 +00:00
James McMullan
1bbd086a17
MacOSX Double / Triple Click Fix
...
This patch corrects issues with double click and adds triple click to
MacOSX. Double click was functioning but double clicking and then
dragging would not work.
2015-03-21 13:41:00 +00:00
Nick Bolton
ecd51d231b
Revert "Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"""
...
This reverts commit 7f721ee7b1
.
2015-03-21 13:38:20 +00:00
Nick Bolton
7f721ee7b1
Revert "Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix""
...
This reverts commit 32323bc0d1
.
2015-03-21 11:42:37 +00:00
Nick Bolton
32323bc0d1
Revert "Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix"
...
This reverts commit b5effc0591
, reversing
changes made to 297100c88a
.
2015-03-21 11:36:38 +00:00
Nick Bolton
b5effc0591
Merge branch 'bug3784-MacOSXDoubleTripleClickFix' of https://github.com/jpmcmu/synergy into jpmcmu-tripple-click-fix
2015-03-21 11:08:53 +00:00
legonigel
447169df32
Fix #4349
...
Fixes issue #4349 in MSWindowsDesks.cpp by using HWND_TOP instead of HWND_TOPMOST. All credit for this fix goes to @gitscrubz and @dubuaych.
2015-03-20 03:12:50 -04:00
legonigel
393ac100c8
Changed shortcut on main window gui for server
...
The shortcut for the server checkbox on the main gui is now Alt-V. This deconflicts the start/stop button.
Fixes #4367
2015-03-09 11:47:13 -04:00
Nick Bolton
702d79570d
Merge pull request #4414 from JoshMcCullough/4389
...
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-09 10:55:43 +00:00
Josh McCullough
4ac8f61a54
Fixed #4389 - removed unused include from platform/MSWindowsScreen.
2015-03-06 18:10:39 -05:00
Nick Bolton
2feb916f2f
Unfucked --enable-drag-drop arg parse #4168
2015-03-04 15:10:03 +00:00
Nick Bolton
3364d38498
Removed unused retry variables #4313
2015-03-04 14:07:43 +00:00
Nick Bolton
b4a1c3627f
Improved SSL error handling for accept/connect socket #4313
2015-03-04 13:59:53 +00:00
Nick Bolton
501dc6c886
More user-friendly SSL errors, and rate limited failure #4313
2015-03-04 13:42:19 +00:00
Nick Bolton
9cdff4a910
Removed throw from checkResult (causes client to freeze) #4313
2015-03-04 12:26:54 +00:00
Nick Bolton
87a81adeb4
Improved SLL error messages and throw on cert error #4313
2015-03-04 12:15:56 +00:00
Nick Bolton
55de0746dc
Copy all plugin files to bin dir (including symbols) #4168
2015-03-04 12:03:38 +00:00
Nick Bolton
a2524d9f57
Make profile dir hack Windows only #4168
2015-03-04 11:51:56 +00:00
Nick Bolton
719e8f6b56
Revert "More robust secure socket error handling #4313 "
...
This reverts commit 40fa58de8c
.
2015-03-04 11:43:52 +00: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