Commit Graph

82 Commits

Author SHA1 Message Date
Jerry (Xinyu Hou) d3a4ce1f11 Moved note into either warning or info #4745 2015-06-01 14:31:32 -07: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
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
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
Adam Potolsky e4f86a8934 Adding pass/fail retry logic to connection attempts #4697 #4650 2015-05-21 15:22:39 -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
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
Adam Potolsky 8c82996fc4 Merge pull request #4608 from legonigel/master
Rename license to LICENSE closes #4487
2015-05-08 09:06:06 -07: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
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 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
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
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
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