120 Commits
Author SHA1 Message Date
Syrone Wong 5d554d966a Bump version and update CHANGES
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-13 19:01:15 +08:00
Syrone Wong a9af9fdfc0 Refactor
- use null conditional access in case some connections been
  cancelled unexpectedly and may cause null reference exception
- Refine error message
- use conditional operator to simplify some code

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-10 15:27:38 +08:00
Syrone Wong 93e7641446 Minor changes
- display user-friendly server name
- clarify proxy type

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-09 08:24:44 +08:00
Noisyfox He e23641c522 Improved debug info output by using isVerboseLogging 2016-08-08 22:24:00 +10:00
Noisyfox He 6a3e06cdb3 Merge branch 'master' of https://github.com/shadowsocks/shadowsocks-windows.git into dev_proxy
# Conflicts:
#	shadowsocks-csharp/Controller/Service/TCPRelay.cs
#	shadowsocks-csharp/Controller/ShadowsocksController.cs
#	shadowsocks-csharp/View/MenuViewController.cs
2016-08-08 21:21:53 +10:00
Syrone Wong d3acb3e681 Refine verbose logging handling
I can't wait until PR #604 get merged, do it manually.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-08 15:36:04 +08:00
Syrone Wong fb3fcdb90d Add verbose logging to log every connection
Note:
- Added a configuration entry, user should add this
  by hand or reset from scratch.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-08 10:33:17 +08:00
Syrone Wong f21c534704 minor changes
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-05 16:31:05 +08:00
Syrone Wong 0494f95fbb Merge branch 'log_connect_to' of https://github.com/kimw/shadowsocks-windows into kimw-log_connect_to 2016-08-05 15:42:14 +08:00
Syrone Wong 6a8a09983e Merge fixes from @GangZhuo, close #478 (#638)
Squashed commit of the following:

commit e280c2385c
Merge: 579039f 87aa9eb
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Wed Mar 16 04:02:27 2016 -0400

    Merge remote-tracking branch 'origin/master'

commit 579039fe40
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:45:23 2016 +0800

    log unhandle exception

commit 8d863f1d5f
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:44:54 2016 +0800

    fix Availability Statistics

commit b3ce1c698a
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 21:07:54 2016 +0800

    tiny refactor

commit 0f7d39e27e
Merge: bd7078a b01aced
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 20:02:58 2016 +0800

    Merge remote-tracking branch 'origin/master'

commit bd7078aa4f
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 20:01:58 2016 +0800

    tiny refactor

commit 49adb95b6e
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 03:44:26 2016 -0500

    log more Ping information for debug

commit 2aa0620ddd
Author: Gang Zhuo <gang.zhuo@gmail.com>
Date:   Fri Mar 4 03:04:10 2016 -0500

    reduce 3rd packages

[solve conflicts and squash to make history clean]
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-05 11:05:16 +08:00
noisyfox 4a1aa01a4f Enable proxy switch 2016-06-30 00:09:45 +08:00
noisyfox 95d4e3a0c0 Add proxy support 2016-06-29 22:38:51 +08:00
kimw f9296b49b1 clean up buggy parameter.
Replaced SocketFlags.None (an enum which euqals 0) from zero.
2016-05-15 02:17:05 -04:00
kimw ff04a2a18a clean up code in C# 6 2016-05-15 02:04:04 -04:00
kimw 0cee110e59 renamed private properties with prefix underline 2016-05-15 01:44:03 -04:00
kimw 4b3ec38691 featured print "connect to hostname:port" to log 2016-05-15 01:34:28 -04:00
kimw 13e125d364 bump up version 2016-05-01 18:39:35 -04:00
Gang Zhuo 3da00178de better way to kill privoxy 2016-03-03 21:49:40 -05:00
Gang Zhuo 4325b7f6f9 fix https://github.com/shadowsocks/shadowsocks-windows/issues/466 2016-03-02 21:00:57 -05:00
Gang Zhuo a9589dba8b bump 3.0 2016-03-01 21:24:30 -05:00
icylogic a99fef37d3 track multiple servers at the same time
Correct AvailabilityStatistics's behavior under special strategies like "LoadBalance", which may switch the server several times in a short period.
2016-03-01 21:32:43 +08:00
icylogic 7914d704d9 finish basic calculation 2016-03-01 14:53:57 +08:00
icylogic e0e0f646b0 fix the chart 2016-03-01 00:38:43 +08:00
icylogic 3b7cbf8020 fix weird logic for reading files. 2016-02-29 21:36:55 +08:00
icylogic 2086b5900d Merge remote-tracking branch 'upstream/master' into feature/statistics_ui
# Conflicts:
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Strategy/StatisticsStrategy.cs
#	shadowsocks-csharp/View/StatisticsStrategyConfigurationForm.cs
2016-02-29 20:56:01 +08:00
Licshee a8ffc60d31 updated StringEx to 0.2, in favor of s.NonWhiteSpaceLines() 2016-02-06 15:03:52 +08:00
Licshee 732866c095 Merge branch 'master' into using-StringEx 2016-02-06 13:41:42 +08:00
Licshee 281dfe028a . 2016-02-06 13:40:56 +08:00
Licshee 4a45d60c40 more reliable & maintainable extension methods 2016-02-06 12:56:25 +08:00
Licshee 0c7597cdf4 moar 2016-02-06 11:36:40 +08:00
icylogic 06d60f54bc redesign statistics form 2016-02-05 17:25:48 +08:00
Licshee 859474b577 misc improve 2016-02-04 17:30:04 +08:00
icylogic bec1f808b3 add an option for Ping tests (disabled by default) and improve the readability of the code 2016-01-20 23:51:51 +08:00
icylogic 586caab7c4 follow CA1001: Types that own disposable fields should be disposable
https://msdn.microsoft.com/library/ms182172.aspx
2016-01-19 02:04:49 +08:00
icylogic ce67551d31 migrate to record data model 2016-01-19 01:46:21 +08:00
icylogic aef4b86c91 refactor AvailabilityStatistics to singleton 2016-01-18 17:21:06 +08:00
icylogic 6df589facf fix error caused by type migration 2016-01-18 16:42:33 +08:00
icylogic e0ee791e3b Merge remote-tracking branch 'upstream/master' into feature/statistics_ui 2016-01-18 16:38:02 +08:00
icylogic b735d59d8a remove ISP/Geolocation detection 2016-01-18 16:28:03 +08:00
icylogic 7599704d1f add speed to statistics 2016-01-18 01:31:50 +08:00
icylogic 5b895efdba Merge branch 'master' into feature/statistics_ui 2016-01-17 17:30:46 +08:00
Simon Dong 5a0a35a839 fix crashed when dns can't resolve server ip address. 2016-01-14 21:33:06 +08:00
Simon Dong 0b73017250 create statistics file if not exists. 2016-01-14 21:33:06 +08:00
kimw 1ee07d196a save bandwidth in config file per shadowsocks server 2016-01-10 10:23:58 +08:00
kimw f9bd1c9150 featured: save bandwidth in config.json file 2016-01-10 09:45:25 +08:00
Gang Zhuo b918cb85ae tiny fix 2016-01-05 01:54:42 -05:00
kimw 22accf4a90 reformated source code 2016-01-05 03:49:57 +08:00
kimw c2095b5ad7 migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files. 2016-01-05 03:45:26 +08:00
kimw 64390d45ac GetTempPath() now supports: return a full path with filename combined which pointed to the temporary directory 2016-01-04 23:56:43 +08:00
kimw 2cce646700 featured show bandwidth in log form's title 2016-01-04 23:21:53 +08:00