Andrew Nelless
50807bfcb6
Restore safe reinterpret_casts in XWindowsScreen
2016-10-05 12:46:16 +01:00
Andrew Nelless
055370412c
Restore safe reinterpret_cast in clipboard converter
2016-10-05 12:46:16 +01:00
Andrew Nelless
fb5e2bb171
Restore safe reinterpret_cast in readUInt32
2016-10-05 12:46:16 +01:00
Andrew Nelless
e81f7ab8c7
Replace unsafe casts with memcpy ops
2016-10-05 12:46:16 +01:00
Andrew Nelless
90c3dd6622
Restore evil-enabling reinterpret_cast in SocketMultiplexer
2016-10-05 12:46:16 +01:00
Andrew Nelless
0371002497
Restore use of reinterpret_cast in unicode routines
2016-10-05 12:46:16 +01:00
Andrew Nelless
f174614655
Remove bizarre cast of sockaddr to char*
2016-10-05 12:46:16 +01:00
Andrew Nelless
9ed9bde4e7
Restore use of reinterpret_cast for sockaddr_in
2016-10-05 12:46:16 +01:00
Andrew Nelless
f3d1470e58
Brutally replace all reinterpret_casts with static_casts
2016-10-05 12:46:16 +01:00
Andrew Nelless
e6a3caaf75
#5628 Fix net lib linkage on Ubuntu
2016-10-04 15:51:07 +01:00
Andrew Nelless
176d7e4725
#5617 Don't copy plugins directory on Windows
2016-10-03 19:47:55 +01:00
Andrew Nelless
45da1dfc7c
#5628 Make enableCrypto directly enable SSL
2016-09-29 13:11:09 +01:00
Andrew Nelless
55a2d1231f
#5628 Initialize SSL on secure client sockets
2016-09-29 13:11:09 +01:00
Andrew Nelless
0d84e4eed6
#5617 Make PacketStreamFilter adopt all socket types
2016-09-29 13:11:09 +01:00
Andrew Nelless
3b5940ac18
#5628 Restore copying of SSL libs on Windows
2016-09-29 13:11:09 +01:00
Andrew Nelless
5db78acab4
#5628 Link Synergy core against OpenSSL
2016-09-29 13:05:04 +01:00
Andrew Nelless
52c8763d97
#5617 Add SecureSocket to TCPSocketFactory
2016-09-29 13:05:04 +01:00
Andrew Nelless
6456271141
#5617 Remove plugin interface from Arch
2016-09-29 13:05:04 +01:00
Andrew Nelless
79fc6239fd
#5617 Revert "Remove plugin interface from Arch"
...
This reverts commit 4613edc17ced61d6aca80cff661323ede0cb9d30.
2016-09-29 13:05:04 +01:00
Andrew Nelless
c3889667ba
#5617 Remove online check for plugins
2016-09-29 13:05:04 +01:00
Andrew Nelless
b55b8f0038
#5617 Revert "Remove plugin args from ArgParser"
...
This reverts commit cd58a8f0d0abe344d8e31a817386f613c7acde25.
2016-09-29 13:05:04 +01:00
Andrew Nelless
b1a991e8cd
#5617 Revert "Remove plugin directory support"
...
This reverts commit fc697d2ab79bbd2d607c97658c986b629a1280ed.
2016-09-29 13:05:04 +01:00
Andrew Nelless
45ef3e1080
#5617 Remove plugin interface from Arch
2016-09-29 13:05:04 +01:00
Andrew Nelless
77d6b83b0c
#5617 Remove stray PluginVersion includes
2016-09-29 13:05:04 +01:00
Andrew Nelless
a2ad4cb0dc
#5617 Remove plugin args from ArgParser
2016-09-29 13:05:04 +01:00
Andrew Nelless
011da60cca
#5617 Remove plugin infra from ClientApp
2016-09-29 13:05:04 +01:00
Andrew Nelless
85227f41a1
#5617 Remove plugin infra from ServerApp
2016-09-29 13:05:04 +01:00
Andrew Nelless
f7e588dfff
#5617 Remove plugin directory support
2016-09-29 13:05:03 +01:00
Andrew Nelless
dc93b063b7
#5617 Remove plugin infra from TCPSocketFactory
2016-09-29 13:05:03 +01:00
Andrew Nelless
5774f5a291
#5617 Remove plugin infra from Client
2016-09-29 13:05:03 +01:00
Andrew Nelless
27ccddbea4
#5617 Remove plugin infra from ClientListener
2016-09-29 13:05:03 +01:00
Andrew Nelless
76b2558f1a
#5617 Delete the plugin infrastructure
2016-09-29 13:05:03 +01:00
Andrew Nelless
665bd91dbd
#5628 Move SSL socket code from plugin to lib/net
2016-09-29 13:04:57 +01:00
Andrew Nelless
c7bf59e6c1
Merge changes from v1.8.3
2016-09-26 15:33:57 +01:00
Andrew Nelless
c418d66f60
#3305 Rename macOS MediaKeySimulator to MediaKeySupport
2016-09-26 11:58:33 +01:00
Andrew Nelless
e76b4a7747
#3305 Send macOS media key events to clients
2016-09-26 11:58:33 +01:00
Andrew Nelless
1b0d4308e2
#3305 Map brightness keys correctly on macOS servers
2016-09-26 11:58:33 +01:00
Andrew Nelless
6294679fcd
#3305 Detect media keys on macOS server
2016-09-26 11:58:33 +01:00
Andrew Nelless
6d5b2707c8
#3305 Add logging for unknown macOS events
2016-09-26 11:58:33 +01:00
Xinyu Hou
a17779e7fd
#123 Disabled clipboard grab mechanism when clipboard is disabled
2016-09-26 11:58:33 +01:00
Xinyu Hou
ce4effa2c8
#123 Fixed warning on Linux
2016-09-26 11:58:33 +01:00
Xinyu Hou
eafc548b97
#123 Made disable clipboard take effect on client
2016-09-26 11:58:33 +01:00
Xinyu Hou
90673e8b87
#123 Added note about disabling clipboard
2016-09-26 11:58:33 +01:00
Xinyu Hou
673829f511
#123 Made disable clipboard take effect on server
2016-09-26 11:58:33 +01:00
Xinyu Hou
9c0bac7c7d
Fixed indentations
2016-09-26 11:58:33 +01:00
Xinyu Hou
3c94310c9e
#123 Read clipboard sharing option and pass it to all clients
2016-09-26 11:58:33 +01:00
Xinyu Hou
d78758ab7d
Fixed indentation
2016-09-26 11:58:33 +01:00
Xinyu Hou
dc80ab4023
#4740 Sent heartbeat message between each chunk message
2016-09-26 11:58:33 +01:00
Xinyu Hou
d8ace7fb4a
#4740 Used global const rather than macro
2016-09-26 11:58:33 +01:00
Xinyu Hou
8ab69a22ae
#4740 Forced delay on heartbeat rather than each clipboard chunk
2016-09-26 11:58:33 +01:00
Xinyu Hou
d14d907ac1
#4740 Removed clipboard interrupt code
2016-09-26 11:58:33 +01:00
Andrew Nelless
fc6ce84ee4
Don't pollute the log with clipboard data at DEBUG2
2016-09-26 11:58:33 +01:00
Xinyu Hou
ceecee0f57
#4740 Used safer static cast
2016-09-26 11:58:33 +01:00
Xinyu Hou
71741da721
#4740 Only adopted non-SSL socket
2016-09-26 11:58:33 +01:00
Xinyu Hou
07f7baf335
#4740 Passed IDataSocket directly
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
61c0bd1910
Removed unused variable
2016-09-26 11:58:33 +01:00
XinyuHou
f2846b1586
Remove disconnect on retry exceed
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
16dbb7cd6a
Fixed using the wrong variable name
2016-09-26 11:58:33 +01:00
XinyuHou
a471bdcea7
Made a own copy of ClientArgs in Client
2016-09-26 11:58:33 +01:00
XinyuHou
a12ae98e9f
Used parent pointer for socket accept
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
e1be5a66b7
Used correct event target
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
6d86a6033f
Removed dead code
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
e0819b86cd
Conflicts:
...
src/lib/plugin/ns/SecureSocket.cpp
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
07902d623c
Removed dead code
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
08a73218e6
Refactored secure read and write into SecureSocket
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
61b489ab3d
Refactor write and read into functions
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
436e333f6f
Fixed indentations
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
3df75f9601
Conflicts:
...
src/lib/server/ClientListener.cpp
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
e1be67cfb6
Fixed indentations
...
Conflicts:
src/lib/client/Client.h
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
95464d97cf
Conflicts:
...
src/lib/client/Client.cpp
src/lib/net/TCPSocketFactory.cpp
2016-09-26 11:58:33 +01:00
XinyuHou
e32402b5c6
#4740 Moved clipboard transfering back into main thread on server
2016-09-26 11:58:33 +01:00
XinyuHou
4ad2c6b10d
#4740 Moved clipboard transfering back into main thread on client
2016-09-26 11:58:33 +01:00
XinyuHou
82043ca435
#4740 Used the same chunk size for secure and non-secure sockets
2016-09-26 11:58:33 +01:00
XinyuHou
3e1a86c3c1
#5502 Reverted disabled sending clipboard on inactive grab
...
This reverts commit 2ad4b896f3
.
2016-09-26 11:58:33 +01:00
Andrew Nelless
c3c0913633
Update company copyright notice
2016-09-26 11:58:33 +01:00
Andrew Nelless
36be2051c2
Change company domain name
2016-09-26 11:58:33 +01:00
Andrew Nelless
7d11004575
#4768 Expand scope of X display lock in getCurrentTime()
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
de91be1035
#2765 Added unit tests for KeyMap
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
2ffaf42faa
#2765 Made index output 1 based
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
adaf325e6f
#2765 Made sure extra sensitive modifier is not down on exact match
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
b80760bb2d
#2765 Matched exactly only when all required modifiers are ready down
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
178b7cc673
#2765 Made sure required modifiers already down when map command keys
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
7a0fae2f6c
#2765 Fixed wrong bit shifting to match OSX modifier mask
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
57950d39a3
Revert "Revert "Used input source ID as the key in group map #2765 ""
...
This reverts commit a70cba80ea
.
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
c772a59572
Revert "Revert "Made index 1 based in log #2765 ""
...
This reverts commit fec53e812f
.
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
f4bd2dab82
#3305 Fixed class name convention for Mac and Linux
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
b27a59fb0d
#3305 Fixed class name convention from porting code
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
df8443e795
#3305 Fixed Linux key types incompatible issue
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
1a4a313ece
#3305 Added mission control and launchpad support
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
ab4f59eac4
#3305 Made Mac clients aware of brightness keys
2016-09-26 11:58:33 +01:00
Xinyu Hou (Jerry)
67f14da691
#3305 Added brightness up and down support
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
bd0d8e7321
#3305 Added default implementation for fakeMediaKey for Linux and Mac
2016-09-26 11:58:33 +01:00
Jerry (Xinyu Hou)
d9a6c14170
#3305 Used Mac native way to simulate media keys
2016-09-26 11:58:33 +01:00
XinyuHou
c5d5d5cba0
#4978 Made VersionHelper Windows specific
2016-08-08 16:41:01 +01:00
Andrew Nelless
04184b51ea
#4978 Removed deprecated usage of GetVersionEx
2016-08-08 16:41:01 +01:00
Andrew Nelless
3ead310161
#4978 Fixed HANDLE string formatting on 64bit Windows
2016-08-08 16:41:01 +01:00
Andrew Nelless
bc24568a6f
#4978 Removed deprecated GetVersionEx call when checking Windows version
2016-08-08 16:41:01 +01:00
Andrew Nelless
74c48c6516
#4978 Removed getOSName impl relying on deprecated GetVersionEx
2016-08-08 16:41:01 +01:00
Jake Petroules
433cfc232c
#4978 Removed obsolete code for unsupported OS versions.
2016-08-08 16:41:01 +01:00
Jerry (Xinyu Hou)
d37d3e8944
#4978 Replaced the superseded SetWindowLong API
2016-08-08 16:41:01 +01:00
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