Andrew Nelless
13e8047967
#4978 Conditional linking C runtime lib
2016-08-08 16:41:01 +01:00
Andrew Nelless
c2b6b60cec
#4978 Compile core on VS2015
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
42494a72a5
#3305 Fixed class name convention for Mac and Linux
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
10a1ae8271
#3305 Fixed class name convention from porting code
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
e742269ada
#3305 Fixed Linux key types incompatible issue
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
8f99911636
#3305 Added mission control and launchpad support
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
1f78fe6f6d
#3305 Made Mac clients aware of brightness keys
2016-08-08 16:41:01 +01:00
Xinyu Hou (Jerry)
8058ed06a1
#3305 Added brightness up and down support
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
d3814cc454
#3305 Added default implementation for fakeMediaKey for Linux and Mac
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
9115d5570b
#3305 Used Mac native way to simulate media keys
2016-08-08 16:41:01 +01:00
Andrew Nelless
f6e1dd51fa
#4768 Workaround locking issue in X11 getCurrentTime()
2016-08-08 14:38:26 +01:00
Andrew Nelless
8a4caba386
#5087 Ensure createBlankCursor() doesn't try to create 0x0 cursor
...
XQueryBestCursor sometimes returns 0 for both width and height of the
cursor pixmap. Also caused #5322 and #5068
2016-08-08 14:38:26 +01:00
Jerry (Xinyu Hou)
47ef8b09bd
#4768 Reset thread when it finishes
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
725cc7a2f8
#4922 Increased server help message buffer
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
683d9b3786
Revert "Check list in a reverse order #2765 "
...
This reverts commit 3de98a2f44a20449468496d47f5642b534a80cf6.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
fec53e812f
Revert "Made index 1 based in log #2765 "
...
This reverts commit 177c2764259c097d0f0f0fa6e081c42bcef91ce5.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
a70cba80ea
Revert "Used input source ID as the key in group map #2765 "
...
This reverts commit 4208e89eaec211d332af9ac7b977107d6712e8dd.
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
2ad4b896f3
#4768 Disabled sending clipboard on inactive grab
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
83c0dea2e4
#4792 Calculated log message size rather than using fixed size
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
18c2c90144
#3044 Stopped attach hook thread to foreground
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
9caa04237c
Refined file transfer log output
2016-08-08 14:36:43 +01:00
Jerry (Xinyu Hou)
30fa5223bc
#4768 Fixed race condition on active client proxy switch
2016-08-08 14:36:42 +01:00
Jerry (Xinyu Hou)
1a76acd446
#4768 Interrupted both clipboards
2016-08-08 14:36:42 +01:00
Jerry (Xinyu Hou)
80292961ad
Continue after close old process #5277
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
17c35f53f4
Applied name convention to KeyResource #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
8003c4a2ad
Made IKeyResource OSX specific #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
6d2040b698
Reorganised KeyResource #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
6d93a28c2e
Used input source ID as the key in group map #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
583ac1ed2d
Made index 1 based in log #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
7bf9ca44ae
Check list in a reverse order #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
7f786cc884
Refactor KeyResource into own files #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
ed0888880c
Rename CUCHRKeyResource to UchrKeyResource #2765
2016-08-08 14:27:13 +01:00
Jerry (Xinyu Hou)
929431f5fc
Remove support for OSX 10.4 and below #2765
2016-08-08 14:27:13 +01:00
Nigel Armstrong
6e7adeac85
Added "--enable-crypto" to help #4922
2016-08-08 14:27:13 +01:00
Asbjorn Kjaer
c7e723030b
Fix log string to use the re-mapped button instead of the input ID #2975
2016-08-08 14:27:13 +01:00
Asbjorn Kjaer
d93ff2f53f
Fix comment #2975
2016-08-08 14:27:13 +01:00
Asbjorn Kjaer
5901fa8aed
Correctly translate mouse events to the right and middle buttons #2975
2016-08-08 14:27:13 +01:00
Will Tinsdeall
428901859e
Use account in auth url #4913
2016-08-08 14:27:13 +01:00
Erik Swan
5e35fe2c1b
Fix mouse speed increase with sleep on Mac server
...
As reported in #451 , with the Mac server, sleeping and resuming (on the
server) causes the mouse speed to double on the client upon resume.
Fix by removing the CFRunLoopSource from the run loop on screen disable
before releasing it. CFRunLoopAddSource in enable() retains the
CFRunLoopSource, so even though the source is released in disable(), the
run loop still has a copy. When the server comes out of sleep and the
screen is enable()'d, another event tap and run loop source are created
and added to the run loop, so the callback is now being called twice for
every mouse movement, and so on for every additional time the server
sleeps.
This is a better approach than the fix in 267f3ac41f
, because although
that fixes the issue by disabling the event tap before the event tap and
run loop source are released, a memory leak still occurs since they are
retained by the run loop.
Additional references on the behavior of CFRunLoopAddSource:
https://developer.apple.com/library/mac/documentation/CoreFoundation/Reference/CFRunLoopRef/index.html#//apple_ref/c/func/CFRunLoopAddSource
http://www.cocoabuilder.com/archive/cocoa/242438-trouble-with-event-taps.html
2016-03-15 12:57:54 -07: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)
5661a41d42
Fix code style
2016-03-15 12:57:06 -07:00
XinyuHou
e5c1821088
Outpup log before return #4740
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
3ce078f0e8
Fix wrong elevate information #5041
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
70104190e4
Add elevate log info #5041
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
20d9b80291
Remove checking system clipboard formats #5041
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
1ac8db56d9
Revert "Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates"
...
This reverts commit beac70f90c37b626cb7b0ea7bf2d18fdd3729013.
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
92a3c47ed2
Revert "Issue #5041 - properly update activeDesk and activeDeskName when screen saver activates"
...
This reverts commit 3615add7b80838dc8b93cb89f2c8f87254db6c21.
2016-03-15 12:57:06 -07:00
Jerry (Xinyu Hou)
da5e9527a3
Revert "Refactor Issue #5041 workaround to make sure we still send the SCREENSAVER message"
...
This reverts commit 43ba3e889f88e526673ff70caf2b3efe26b13363.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
4d19941428
Revert "Revert to old behavior of checkDesk(), add workaround to broken EnumClipboardFormats() in the case where the server is started while the screen saver is active."
...
This reverts commit 38209e5079d1695ddd561f8045647e077fccff91.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
42038ce24e
Revert "Minor cosmetic change - missing some debug stuff in this branch."
...
This reverts commit bd660fedbfbff2df1bf5921826dd7717c2839161.
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
89eb64a0aa
Reorder clipboard format #2909
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
4344b16a20
Remove some hack code #2909
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
221a9a71c4
Add comment #4827
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
6d0f820db5
Fix indentations
2016-03-15 12:57:05 -07:00
Jerry (Xinyu Hou)
3067560f7b
Fix indentations
2016-03-15 12:57:04 -07:00
Jerry (Xinyu Hou)
ee20d08080
Revert "Revert "Fixed using wrong local variable #4723 ""
...
This reverts commit a0beae0f4b5578a16178e6324f2d1f588caeb442.
2016-03-15 12:51:42 -07:00
Jerry (Xinyu Hou)
5fae9efe78
Revert "Revert "Added timeout for waiting active destop result #4723 ""
...
This reverts commit 0f8a5687719605af59d901f08dfbb5dde74a7dc9.
2016-03-15 12:51:42 -07:00
Jerry (Xinyu Hou)
2fb36c4f86
Revert "Revert "workaround for Fast cursor on any client with Mac server #451 ""
...
This reverts commit 6470240379c896ee13ee98b9a8c951d22f4351c1.
2016-03-15 12:51:22 -07:00
Nye Liu
6f904e55f1
Minor cosmetic change - missing some debug stuff in this branch.
2016-03-15 12:47:34 -07:00
Nye Liu
bab2e985a3
Revert to old behavior of checkDesk(), add workaround to broken EnumClipboardFormats() in the case where the server is started while the screen saver is active.
2016-03-15 12:47:33 -07:00
Nye Liu
425fc8b925
Refactor Issue #5041 workaround to make sure we still send the SCREENSAVER message
2016-03-15 12:47:33 -07:00
Nye Liu
9036d42469
Issue #5041 - properly update activeDesk and activeDeskName when screen saver activates
...
Ensure that we actually kill the server if we go from screen saver desk to real
desk.
2016-03-15 12:47:33 -07:00
Nye Liu
1fc28392d0
Add error message to help debug Issue #5041
2016-03-15 12:47:33 -07:00
Nye Liu
3e37518b92
Workaround for Issue #5041 - prevent synergys from shutting down when screen saver activates
...
When it is restarted, and screen saver is active, the clipboard no longer works
correctly.
The desk swap detection routine just below does not work properly when the
desktop goes from screensaver back to normal. If it did, probably this
workaround would not be needed.
2016-03-15 12:47:33 -07:00
Nye Liu
48069f1a3b
Always call wait() at least once even if timeout is 0 to prevent deadlocks
2016-03-15 12:46:45 -07:00
Nye Liu
b85b9125ea
Remove inadvertent additions
2016-03-15 12:46:45 -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)
0207b697e3
Remove debug logging #5030
2015-11-30 12:01:00 -08:00
Jerry (Xinyu Hou)
42f201785c
Revert "Added timeout for waiting active destop result #4723 "
...
This reverts commit aec52c36e6
.
2015-11-24 11:53:38 -08:00
Jerry (Xinyu Hou)
539ac32136
Revert "Fixed using wrong local variable #4723 "
...
This reverts commit d7063a87c8
.
2015-11-24 11:53:18 -08:00
Jerry (Xinyu Hou)
8a2106a09e
Revert "workaround for Fast cursor on any client with Mac server #451 "
...
This reverts commit 267f3ac41f
.
2015-11-24 11:40:04 -08:00
Jerry (Xinyu Hou)
3bca8deac3
Use secure URL #4715
2015-11-23 11:42:47 -08:00
Jerry (Xinyu Hou)
953ad5bc4a
Use live URL #4715
2015-11-23 10:03:44 -08:00
Jerry (Xinyu Hou)
fbd2c1413e
Merge branch 'jerry-sandbox2'
2015-11-23 09:54:05 -08:00
Jerry (Xinyu Hou)
fa8a0ebbfe
Make center point be aware of DPI scaling #5030
2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
df89859400
Fix indentation
2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
c259af9b41
Fix code style
2015-11-19 13:46:48 -08:00
Jerry (Xinyu Hou)
4f1f2dcff0
Use condition instead of assertion #5030
2015-11-19 13:46:48 -08:00
XinyuHou
af305ba3df
Add size_t dependency #5030
2015-11-19 13:46:47 -08:00
Jerry (Xinyu Hou)
0cc831b2fb
Fix code style
2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
c994b0a4f7
Make sure all variables are non zero #5030
2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
a09bfc5f07
Fix high DPI breaking edge detection and mouse delta calculation #5030
2015-11-19 13:46:46 -08:00
Jerry (Xinyu Hou)
66335cd6f8
Pass resolution and center into core on Windows #5030
2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou)
1ccc258455
Add DPI helper #5030
2015-11-19 13:46:45 -08:00
Jerry (Xinyu Hou)
e1e38bd3a2
Compress network error during notification #4932
2015-11-19 10:01:50 -08:00
Jerry (Xinyu Hou)
4698394e21
URL encode identity and MAC address
2015-11-18 11:51:45 -08:00
Jerry (Xinyu Hou)
f8e9047c36
Rephrase and refactor serial warning message #4716
2015-11-17 14:17:00 -08:00
Jerry (Xinyu Hou)
4b7796d215
Catch exception from notification request #4932
2015-11-12 12:05:26 -08:00
Jerry (Xinyu Hou)
55df81b1a6
Add company and email into serial key #4715
2015-11-12 10:08:35 -08:00
Jerry (Xinyu Hou)
4c1b6f3f23
Use test website #4932
2015-10-30 13:49:18 -07:00
Jerry (Xinyu Hou)
10e3917b61
Change notify failure log level #4932
2015-10-30 13:42:05 -07:00
Jerry (Xinyu Hou)
382607129c
Make notify failure silent #4932
2015-10-30 12:43:28 -07:00
Jerry (Xinyu Hou)
73ac3df22d
Limit expired time to trial version #4716
2015-10-30 11:41:51 -07:00
Jerry (Xinyu Hou)
068b3b98ed
Fix compile warnning #4933
2015-10-30 11:25:16 -07:00
Jerry (Xinyu Hou)
0a1c439535
Only send notify request on wizard finish #4932
2015-10-29 16:50:23 -07:00
Jerry (Xinyu Hou)
b4563a42c4
Use string split function in syntool #4933
2015-10-29 15:47:10 -07:00
Jerry (Xinyu Hou)
d429988e73
Add more unit tests for split string function #4933
2015-10-29 13:00:03 -07:00
Jerry (Xinyu Hou)
72397137c0
Add split string function #4933
2015-10-29 12:52:55 -07:00
Jerry (Xinyu Hou)
582629e968
Use the passed in OS info if specified #4933
2015-10-28 17:29:42 -07:00
Xinyu Hou
a4c799c285
Notify activation when skipping or using serial #4932
2015-10-27 16:31:09 -07:00
Xinyu Hou
4d20a3ce91
Add OS and arch in auth request #4933
2015-10-27 15:50:34 -07:00
Xinyu Hou
32da441fc0
Simplify OS info on Unix #4933
2015-10-27 15:45:39 -07:00
Jerry (Xinyu Hou)
da315ec164
Add unit tests for subscription manager #4715
2015-10-23 11:35:58 -07:00
Jerry (Xinyu Hou)
978c97cbc0
Refactor parse plain serial #4715
2015-10-23 11:35:57 -07:00
XinyuHou
0429986470
Add dependency for Linux #4715
2015-10-22 16:41:48 -07:00
Jerry (Xinyu Hou)
85ef7935cc
Rename a variable
2015-10-22 16:04:05 -07:00
Jerry (Xinyu Hou)
ca0237dcc7
Remove legacy subscription checking #4715
2015-10-21 17:48:44 -07:00
Jerry (Xinyu Hou)
18e7004213
Add subscription functionalities in syntool #4715
2015-10-21 16:35:22 -07:00
Jerry (Xinyu Hou)
8f941f5713
Port subscription feature #4715
2015-10-21 16:00:23 -07:00
Jerry (Xinyu Hou)
d2c94bfb04
Revert "Removed mutex locking from get and set of log level #4809 "
...
This reverts commit 3eef49d5c9
.
2015-08-06 12:57:57 -07:00
Xinyu Hou
9b09703c1a
Revert "Allowed reconnect after SSL fatal error #4857 "
...
This reverts commit cbd63e9d67ead4199d5ab49b17d68a7583421d92.
2015-08-06 12:55:59 -07:00
Xinyu Hou
95c9ffe7e8
Removed unused variable #4866
2015-08-03 16:38:42 -07:00
Jerry (Xinyu Hou)
5b1e7acca9
Plugin version to 1.3
2015-08-03 16:29:36 -07:00
Jerry (Xinyu Hou)
0f4837aa21
Fixed warning on Mac 10.6 #4866
2015-08-03 15:56:39 -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
Xinyu Hou
fedad2b8a1
Improved plugin version logging for Unix #4866
2015-08-03 15:55:37 -07:00
Nick Bolton
3eb1bffb70
Improved variable name for plugin loading on Windows #4866
2015-08-03 15:51:53 -07:00
Nick Bolton
cb5f0f7b12
Improved plugin version logging for Windows #4866
...
Conflicts:
src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:51:27 -07:00
Jerry (Xinyu Hou)
dc72b4e512
Changed plugin version mismatch log level to error #4866
2015-08-03 15:46:47 -07:00
Jerry (Xinyu Hou)
6602ebe435
Refactored adding plugin only after loaded #4866
...
Conflicts:
src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:45:31 -07:00
Xinyu Hou
a99699df7a
Only loaded matching plugin on Mac #4866
...
Conflicts:
src/lib/arch/unix/ArchPluginUnix.cpp
2015-08-03 15:43:54 -07:00
Jerry (Xinyu Hou)
a249c38b96
Only loaded matching plugin on Windows #4866
...
Conflicts:
src/gui/gui.pro
src/gui/src/PluginManager.cpp
src/lib/arch/win32/ArchPluginWindows.cpp
2015-08-03 15:41:57 -07:00
Jerry (Xinyu Hou)
86d5567e74
Removed redundant logging #4721
2015-07-31 13:57:18 -07:00
Jerry (Xinyu Hou)
5d61996405
Fixed code style #4712
2015-07-31 13:56:58 -07:00
Xinyu Hou
1659f9f018
Added keep alive massge before each data transfer #4712
2015-07-31 13:56:33 -07:00
Jerry (Xinyu Hou)
9d44affc89
Fixed Ipc unit test intermittently fail #4721
2015-07-31 13:56:10 -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)
bfc3ac340f
Fixed possible loss of data warning #4677
2015-07-31 13:55:23 -07:00
Jerry (Xinyu Hou)
c3d38db053
Made buffer thread wait for notify when no gui #4721
2015-07-31 13:55:00 -07:00
Jerry (Xinyu Hou)
5ec9ccc76e
Revert "Made buffer thread wait until there is a GUI client #4721 "
...
This reverts commit 9a4327e44236c0ac30809660dc87a97e984dc84f.
2015-07-31 13:52:56 -07:00
Xinyu Hou
5a9cbc97e3
Fixed code style
...
Conflicts:
src/lib/arch/win32/ArchPluginWindows.cpp
2015-07-31 13:51:48 -07:00
Xinyu Hou
afdcb9cefe
Made buffer thread wait until there is a GUI client #4721
...
Conflicts:
src/lib/ipc/IpcLogOutputter.cpp
2015-07-31 13:49:17 -07:00
Jerry (Xinyu Hou)
cc3dc315f9
Allowed reconnect after SSL fatal error #4857
2015-07-31 13:46: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)
c2b96cfbb7
Updated comment #4750
2015-07-31 13:45:46 -07:00
Jerry (Xinyu Hou)
d51eb7b8b5
Fixed code style
2015-07-31 13:42:51 -07:00
Jerry (Xinyu Hou)
f8bb948776
Removed unused variable #4750
2015-07-31 13:42:41 -07:00
Jerry (Xinyu Hou)
0ddf544efb
Used static variable than define #4750
...
Conflicts:
src/lib/plugin/ns/SecureSocket.cpp
2015-07-31 13:25:03 -07:00
Jerry (Xinyu Hou)
44966ee17f
Removed redundant log #4858
2015-07-31 13:22:50 -07:00
Jerry (Xinyu Hou)
4fe46e117e
Shorten data transfer log #4858
2015-07-31 13:20:50 -07:00
Jerry (Xinyu Hou)
485547d6ea
Reverted Notify back to note #4855
2015-07-31 13:20:35 -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)
a8cf9173c8
Revert "Changed note to notify #4745 "
...
This reverts commit 5006adedfe
.
Conflicts:
src/test/unittests/ipc/IpcLogOutputterTests.cpp
2015-07-31 13:19:17 -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
Jerry (Xinyu Hou)
9483fecc42
Fixed code style
...
Revert "Moved note into either warning or info #4745 "
This reverts
commit d3a4ce1f11
.
Revert "Changed note to notify #4745 "
This reverts commit
5006adedfe
.
Conflicts:
src/test/unittests/ipc/IpcLogOutputterTests.cpp
Shortened transmission log #4858
Revert "Added code to throw an error if the plugin can't be deleted or
written to #4696 "
This reverts commit
5696497bc0
.
2015-07-31 13:17:12 -07:00
Jerry (Xinyu Hou)
cfec3a93f2
Fixed code style
2015-07-06 16:48:36 -07:00
Jerry (Xinyu Hou)
260a7337d3
Added timestamp in log #4845
2015-07-06 15:50:21 -07:00
Jerry
23739f8484
Prevented open clipboard twice #4815
2015-07-06 13:00:28 -07:00
Jerry (Xinyu Hou)
8a026e06bd
Merge remote-tracking branch 'origin/v1.7.4-stable'
2015-06-30 15:43:39 -07:00
Xinyu Hou
85dc7a566e
Made log consistent #4745
2015-06-30 03:37:36 +01:00
Jerry (Xinyu Hou)
673fba5846
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-25 12:38:33 -07:00
Jerry (Xinyu Hou)
3aebb87b37
Fixed using old log level convention #4745
2015-06-25 11:25:58 -07:00
Adam Potolsky
9dc0a1d862
Added comment for clarity #4750
2015-06-25 09:54:28 -07:00
Adam Potolsky
25c1754d2d
Merge branch 'master' into adam-sandbox
2015-06-25 09:46:21 -07:00
Adam Potolsky
4569de5413
Fixed misplaces statis string in windows code #4793
2015-06-25 09:44:16 -07:00
Adam Potolsky
d7043ef84b
Added plugin version output to unix builds #4793
2015-06-25 09:35:56 -07:00
Adam Potolsky
55a38ff8cc
removed unnecessary flag settings, fixed wrong call. #4750
2015-06-24 17:57:22 -07:00
Adam Potolsky
f10f0f13c4
retry case needs to do another job with the same parameters not just a new job #4750
2015-06-24 16:31:47 -07:00
Adam Potolsky
2df88e07c4
fixed retry logic for secure connect and accept #4750
2015-06-24 12:20:25 -07:00
Adam Potolsky
e50b239592
Changed secure connest and accept to match read/write retry logic #4750
2015-06-24 11:11:20 -07:00
kahiroka
267f3ac41f
workaround for Fast cursor on any client with Mac server #451
2015-06-19 17:20:26 -07:00
Adam Potolsky
d51e2e4fb1
Merge branch 'v1.7.4-stable' of https://github.com/synergy/synergy into v1.7.4-stable
2015-06-18 14:19:06 -07:00
Adam Potolsky
3eef49d5c9
Removed mutex locking from get and set of log level #4809
2015-06-18 14:18:05 -07:00
Jerry (Xinyu Hou)
14046db32a
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-15 09:59:38 -07:00
Jerry (Xinyu Hou)
667b6f13c7
Enforced secure socket rewrite on the same buffer address #4712
2015-06-12 18:03:28 -07:00
Jerry (Xinyu Hou)
3e32d9fbee
Improved secure socket intensive try operations #4796
2015-06-12 16:53:41 -07:00
Adam Potolsky
768445816b
Merge branch 'adam-sandbox'
2015-06-12 16:03:34 -07:00
Adam Potolsky
efab42962f
Merge branch 'master' of https://github.com/synergy/synergy
2015-06-12 16:03:25 -07:00
Adam Potolsky
afb0e2a2ea
Added log level protection, changed log levels for some logging #4793
2015-06-12 15:07:53 -07:00
Adam Potolsky
16a2815504
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:40:15 -07:00
Adam Potolsky
4b0dec69bf
Added additional SSL logging abotu connection information as well as client and server cipher availability #4793
2015-06-12 14:33:28 -07:00
Jerry (Xinyu Hou)
72060e59b4
Fixed send clipboard thread time issue #4749
2015-06-12 11:21:05 -07:00
Adam Potolsky
6bb44fbc59
Merge pull request #4228 from galkinvv/fix2866
...
High client CPU usage and laggy mouse
2015-06-11 16:12:40 -07:00
Adam Potolsky
3942dc6ee8
Added stub code for linux/mac builds to match the functional ARCH code for discovering libraris in use #4793
2015-06-11 10:00:45 -07:00
Adam Potolsky
fa0dfa0ded
Added ability to query lib locations to windows builds
2015-06-10 13:18:39 -07:00
Adam Potolsky
8366bb6247
Added OpenSSL version and location logging
2015-06-10 10:20:59 -07:00
Jerry (Xinyu Hou)
099c984d7d
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-09 16:05:43 -07:00
Adam Potolsky
0c211e2852
Adding logging output when ssl connects for aid in debugging and support
2015-06-09 14:07:42 -07:00
Jerry (Xinyu Hou)
a21e4cd73b
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-08 13:53:01 -07:00
Adam Potolsky
ed37eeca51
Merge branch '4696'
2015-06-08 13:24:47 -07:00
Adam Potolsky
155a8b70c4
Added version string to plugin and added to plugin loaded message
2015-06-05 17:07:47 -07:00
Jerry (Xinyu Hou)
5c71efebe6
Fixed integtests #4584
2015-06-05 15:23:44 -07:00
Jerry (Xinyu Hou)
756c3b4463
Inserted keep alive msg among data transfer #4584
2015-06-05 15:21:32 -07:00
Jerry (Xinyu Hou)
bbf53bb9b8
Return the same job on retry #4584
2015-06-05 15:21:26 -07:00
Jerry (Xinyu Hou)
0680c33909
Added file events #4584
2015-06-05 15:21:17 -07:00
Jerry (Xinyu Hou)
7795d68c21
Removed magic number #4712
2015-06-04 14:46:47 -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)
e0903983ad
Validated file expected size #4584
2015-06-04 10:19:36 -07:00
Jerry (Xinyu Hou)
8c64cbf54e
Refactored send drag info on server #4584
2015-06-04 10:04:08 -07:00
Adam Potolsky
78f8fb45ba
Fixed Installed Directory in ARCH for MacOS #4696
2015-06-04 09:58:22 -07:00
Jerry (Xinyu Hou)
ee22e688d5
Removed clipboard ignore notification #4745
2015-06-03 17:32:09 -07:00
Jerry (Xinyu Hou)
d9684d44d2
Added fake drag file list #4584
2015-06-03 16:17:26 -07:00
Jerry (Xinyu Hou)
7614a21aac
Cleared buffer on send instead of write #4721
2015-06-03 14:45:47 -07:00
Jerry (Xinyu Hou)
c4e8dc7198
Merge remote-tracking branch 'origin/master' into jerry-sandbox
2015-06-02 15:30:33 -07:00
Adam Potolsky
0061969cf2
Updating installed dir for Linux and MacOS #4696
2015-06-02 14:28:20 -07:00
Jerry (Xinyu Hou)
8d0fdee5ce
Added full stop for notification #4745
2015-06-02 11:18:21 -07:00
Jerry (Xinyu Hou)
f42b756b0e
Added clipboard transmission failed notification #4745
2015-06-02 11:17:04 -07:00
Jerry (Xinyu Hou)
f22d9ac477
Added clipboard transmission start notification #4745
2015-06-02 11:14:28 -07:00
Jerry (Xinyu Hou)
d9921c894c
Added clipboard transmission notification #4745
2015-06-02 09:48:26 -07:00
Adam Potolsky
98bb9b3fb3
Added getInstalledDir to ToolApp. #4696
2015-06-01 16:43:27 -07:00
Jerry (Xinyu Hou)
4533063768
Fixed compile error on Unix #4745
2015-06-01 16:04:13 -07:00
Jerry (Xinyu Hou)
bfe616eebe
Added file transmission started notification for server #4745
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 #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)
97bac70fae
Stop writing into and clear buffer when no GUI #4721
2015-05-29 16:55:22 -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
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
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
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
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
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
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
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
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
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
68edff43cd
Merge branch 'pr-jpmcmu-macosx-sticky-key-fix'
2015-05-06 13:20:54 +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
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
fb6186304b
Dropped SSLv3 support #4567
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
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
a894615ca7
Fixed ns plugin using old certificate path #4525
2015-04-20 19:08:03 +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
XinyuHou
586a893201
Made retry secure write/read use the exactly last parameters #4539
2015-04-17 14:01:35 +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
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
Xinyu Hou
e405ec25e3
Always log out server fingerprint #4522
2015-04-15 13:25:18 +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
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
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
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
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
Nick Bolton
6ef41522b7
Revert "Fixed: Exception was not thrown on secure accept/connect #4313 "
...
This reverts commit c5ed03a8a0
.
2015-03-04 11:43:42 +00:00
Nick Bolton
cfd21216cd
Fixed: Plugins dir may change depending on user #4168
2015-03-04 11:15:07 +00:00
Nick Bolton
c5ed03a8a0
Fixed: Exception was not thrown on secure accept/connect #4313
2015-03-04 10:14:21 +00:00
Nick Bolton
a6b5c872f5
Rephrased "crypto disabled" log, changed to error #4313
2015-03-04 09:00:01 +00:00
Nick Bolton
40fa58de8c
More robust secure socket error handling #4313
2015-03-03 19:21:14 +00:00
Nick Bolton
6e7b9491d4
Fixed: Incorrect log level used #4168
2015-02-26 16:44:15 +00:00
Nick Bolton
dd57a93345
Added OpenSSL DLLs to Windows installer #4313
...
libeay32.dll
ssleay32.dll
2015-02-26 00:04:17 +00:00
Nick Bolton
bcf1a1c4d4
Added extra logging to plugin loaders #4168
2015-02-26 00:03:24 +00:00
Nick Bolton
eb1083ec45
Fixed: Missing 'else if' on arg parsing #4168
2015-02-25 17:44:17 +00:00
Nick Bolton
a1bfddeb5b
Changed plugin manager to use installed arch #4168
...
Using the processor arch to figure out which plugin to downloa is not
the best idea, since a user could install 32-bit Synergy on 64-bit
Windows.
2015-02-25 17:43:48 +00:00
XinyuHou
226f2c966a
assigned arch static instance instead of create a new one #4313
2015-02-13 15:58:54 +00:00
Xinyu Hou
4014176d8e
Revert "created new instance of arch in plugin #4313 "
...
This reverts commit 8e4f758cb1
.
2015-02-13 14:26:03 +00:00
Xinyu Hou
9f1255d986
Revert "did not pass arch into plugins #4313 "
...
This reverts commit 0f686ff308
.
2015-02-13 14:25:29 +00:00
XinyuHou
0f686ff308
did not pass arch into plugins #4313
2015-02-13 12:42:23 +00:00
XinyuHou
8e4f758cb1
created new instance of arch in plugin #4313
2015-02-13 12:35:12 +00:00
XinyuHou
4cd20d97ea
changed profile directory on mac #4168
2015-02-12 16:52:34 +00:00
XinyuHou
c4c0fc8a08
added enable crypto argument to synergys/c #4313
2015-02-12 15:50:08 +00:00
XinyuHou
bbcca144f5
hacked avoid syntool sigsegv on linux #4168
2015-02-11 17:32:18 +00:00
XinyuHou
b9c5eb2e6f
added certificate generate #4168
2015-02-11 17:28:56 +00:00
XinyuHou
80343c41eb
deleted old home brew crypto #4313
2015-02-11 11:12:54 +00:00
XinyuHou
4fcec1d217
limited ns pluging to Mac 10.8 and above #4168
2015-02-10 16:20:49 +00:00
XinyuHou
7d5df54bd0
fixed copy command for libns on Linux #4168
2015-02-10 13:07:52 +00:00
XinyuHou
31440b1a8a
added const cast #4168
2015-02-10 12:22:30 +00:00
XinyuHou
98716f4e78
fixed compile error on ubuntu64 #4168
2015-02-10 12:13:59 +00:00
XinyuHou
3c4b6163e3
Merge remote-tracking branch 'origin/jerry-sandbox'
2015-02-10 10:28:45 +00:00
XinyuHou
b178d33d62
added plugin downloading from servere #4168
2015-02-09 15:37:47 +00:00
XinyuHou
05e6cb6254
queried plugin list from server #4168
2015-02-06 10:39:58 +00:00
XinyuHou
aa46fe91a7
added activate page in wizard #4168
2015-02-05 14:17:34 +00:00
XinyuHou
097f4c4c1f
Revert "added login window #4168 "
...
This reverts commit ccc5834757
.
2015-02-05 11:44:33 +00:00
XinyuHou
5f33a21878
deleted secure socket when close client time out #4313
2015-02-02 16:06:51 +00:00
XinyuHou
3aa6bed669
handled SSL connect failed on client side #4313
2015-02-02 15:33:40 +00:00
XinyuHou
10e6b5ad63
removed client connection when SSL handshake failed #4313
2015-02-02 14:18:34 +00:00
XinyuHou
ccc5834757
added login window #4168
2015-01-30 16:04:27 +00:00
XinyuHou
ad230d46e6
handled secure socket exception #4313
2015-01-29 16:16:45 +00:00
XinyuHou
767802f111
removed loop accept and connect and added more debug info #4313
2015-01-29 15:40:30 +00:00
XinyuHou
d15c99f41d
rearranged the deletion orders of clientlistener and server #4313
2015-01-28 17:34:19 +00:00
XinyuHou
4e42b9fdbd
fixed memory leak and validate ssl #4313
2015-01-28 17:33:10 +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
a53dae9be3
added assersions before lib func invoking and adjust log level #4313
2015-01-27 11:04:23 +00:00
XinyuHou
85813fd49b
added plugin unload and cleanup #4313
2015-01-27 10:42:10 +00:00
XinyuHou
10cddb97a8
fixed misused read and write #4313
2015-01-26 13:23:11 +00:00
XinyuHou
06253c965b
resolve #4328 by moving plugin into lib folder
2015-01-20 16:18:51 +00:00
XinyuHou
a98c4bd02a
made init function signature consistent #4313
2015-01-20 16:00:15 +00:00
Xinyu Hou
141b778477
refactored SecureSocket to use interface #4313
2015-01-14 17:25:53 +00:00
XinyuHou
be2b87fd39
fixed code style
2015-01-12 10:51:16 +00:00
XinyuHou
f973d1498d
dropped prefix C
2015-01-12 10:33:29 +00:00
XinyuHou
7bff958422
added pluging loader for unix #4313
2015-01-09 13:47:35 +00:00
XinyuHou
1d7eb3f5cb
updated pluging loader for Windows #4313
2015-01-09 13:46:35 +00:00
XinyuHou
de8fe7e2a5
fixed compiler cast warning in drag info class
2015-01-06 14:51:37 +00:00
the-wes
5703a41489
Update Server.cpp
...
clarified "cursor is locked" messages, moved the "scroll lock is on upon startup" message to NOTE level instead of DEBUG.
2014-12-30 13:33:21 -08:00
the-wes
d62c4a842b
Update App.h
...
update --help output.
2014-12-16 18:04:00 -08:00
the-wes
a99bea9d3b
clarify protocol error message
2014-12-05 16:59:39 -08:00
James McMullan
56b54da915
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.
2014-12-04 15:15:38 -05:00
Xinyu Hou
db9f7974ed
Fixed #4249 by add retain count for extension string
2014-12-02 12:36:01 +00:00
Xinyu Hou
c560eabeb2
Fixed close null mutex and condvar
2014-11-27 10:52:08 +00:00
Xinyu Hou
e71e7e1cd3
Catched exception while getting active desktop name
2014-11-27 10:51:58 +00:00
Vasily Galkin
06df954366
fix removing jobs for closed sockets from m_socketJobs (patch by Brian Vincent from synergy issue tracker #2866 )
2014-11-14 18:29:28 +04: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
Xinyu Hou
a4843c4947
Fixed "c" prefix compile error on Mac 10.10
2014-11-11 14:58:30 +00:00
Xinyu Hou
1aaa55163c
Fixed "c" prefix compile error on Windows
2014-11-11 14:50:09 +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
37be6ec45f
Merge pull request #4160 from cribe78/cribe-pullrequest#4055
...
Fixed: Shift keys are not sent to clients #4055
2014-11-06 15:39:30 +00:00
Xinyu Hou
d347cbd45f
Merge branch 'pdecat-master'
2014-11-05 10:25:31 +00:00
chris
65fc59eeae
clean up changes for pull request
2014-11-04 12:17:30 -05:00
chris
93d864ad6f
clean up changes for pull request
2014-11-04 12:16:58 -05:00
chris
8024aa9ab1
Working fix for #4055 (client shift key problem) in place
2014-11-04 12:06:30 -05:00
Xinyu Hou
d2191b6b93
Auto elevate for Windows UAC and screen lock #4130
2014-10-27 16:39:18 +00:00
Xinyu Hou
4d3fd14ada
Merge branch 'caramis-master'
2014-10-27 14:46:54 +00:00
Xinyu Hou
6756296d85
Made daemon take full responsibility for logging #4128
2014-10-27 14:11:43 +00:00
Xinyu Hou
df29bf8e54
Merge branch 'helkanen-master'
2014-10-24 15:10:44 +01:00
Xinyu Hou
5c6eba8790
Merged argsParse to master
2014-10-23 13:21:41 +01:00
Xinyu Hou
a32cb41342
Parse arg refactoring #4124
...
Used argParser in DaemonApp.
2014-10-23 12:09:09 +01:00
Xinyu Hou
a71ebc78b3
Parse arg refactoring #4124
...
Fixed compile error on Linux
2014-10-23 11:37:59 +01:00
Xinyu Hou
943a355359
Parse arg refactoring #4124
...
Used argParser to parse arguments and removed the old code
2014-10-23 11:30:51 +01:00
Xinyu Hou
e26ccfdce6
Parse arg refactoring #4124
...
Added unit testing
2014-10-22 16:52:08 +01:00
Xinyu Hou
f9f2d8e8af
Parse arg refactoring #4124
...
Implemented argParser class.
2014-10-22 16:35:28 +01:00
Xinyu Hou
d2814a423c
Parse arg refactoring #4124
...
Extracted platform specific argument parsing code.
2014-10-22 16:27:38 +01:00
Xinyu Hou
bc772f98a6
Unable to start synergy server with "Cannot create a file when that file already exists" message #3752
...
Go to next iteration as soon as it fails.
2014-10-22 12:53:14 +01:00
Nick Bolton
c2b3f1414b
Merge branch 'master' of https://github.com/pdecat/synergy into pdecat-master
2014-10-22 12:49:16 +01:00
Jean-Philippe Andre
9e358233c3
Fix copy&paste for EFL applications
...
Fixes issue 4021.
2014-10-22 20:32:16 +09:00
Nick Bolton
4a24a2117a
Merge branch 'master' of https://github.com/caramis/synergy into caramis-master
2014-10-22 11:59:14 +01:00
Xinyu Hou
4aa43d6995
Merge branch '64bit' of https://github.com/petroules/synergy into petroules-64bit
2014-10-22 11:40:00 +01:00
Xinyu Hou
504e41966e
Carbon loop not ready within 5 sec #4002
...
Port fix from enterprise.
2014-10-21 15:48:04 +01:00
SeokYeon Hwang
3a663092cf
Do not throw exception if ProcessIdToSessionId() is failed.
...
Many security solutions forbid other program from accessing their own process. So if ProcessIdToSessionId() is failed, simply ignore it.
Signed-off-by: SeokYeon Hwang <caramis@gmail.com>
2014-10-21 19:51:28 +09:00
Jake Petroules
7dd2db25ec
Add support for building with 64-bit architectures on OS X.
...
This patch brings full 64-bit compatibility to Synergy on OS X by
replacing all obsolete 32-bit only Carbon functions with modern
equivalents. All functions introduced have been available since 10.4 so
this won't affect the minimum deployment target. Specifically:
Creating an empty CGEvent and getting its location is behaviourally
identical to GetGlobalMouse, and yes, both are in flipped coordinates.
This was tested with a multi-monitor configuration as well.
TrackMouseLocationWithOptions is behaviourally identical to
GetGlobalMouse in these cases because the timeout was 0 and none of the
other out params were used, except for the MouseTrackingResult in one
call was checked against kMouseTrackingTimedOut. Since the timeout was 0
and not kEventDurationForever, that value never could have been returned
anyway.
Instead of attempting to define SIntXX and UIntXX manually, MacTypes.h
is included on OS X. These types were wrong in 64-bit mode because of
this, causing type redefinition errors.
2014-10-15 19:29:49 -07:00
Patrick Decat
aeab72f724
Apply patch from https://github.com/synergy/synergy/issues/3749
2014-10-15 14:51:44 +02:00
jerry
7e562273d5
[no-issue]
...
revert to r2421
2014-09-15 15:17:07 +00:00
jerry
1805dd7900
issue #575 - Cannot build x86_64 or ppc64 on Mac OS X
...
applied patch by Jake Petroules
2014-09-15 13:04:43 +00:00
jerry
c4dd6eb61c
sticky keys fix doesn't work, may make things worse - backed out [no-issue]
2014-08-01 10:35:16 +00:00
Nick Bolton
3a6d9e82e3
added comment about protocol version [no-issue] [no-build]
2014-07-28 08:19:29 +00:00
jerry
995730a646
issue #18 - Sticky modifier/meta keys
...
- improved on Mac.
2014-07-02 13:25:49 +00:00
jerry
507abdcbfb
issue #4072 Carbon loop not ready within 5 sec
...
added lock to all condVar
2014-06-02 16:07:58 +00:00
jerry
9feaa959f1
issue #4072 - Carboon loop not ready within 5 sec
...
issue solved
2014-06-02 11:04:09 +00:00
jerry
1dfe867c54
issue #4060 - Key stuck down on Windows server
...
finished solving issue.
2014-05-23 15:01:29 +00:00