Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
786 Commits 7 Branches 37 Tags
3.2
Commit Graph
233 Commits
Author SHA1 Message Date
Syrone Wong 30aadf0909 Merge pull request #654 from 772807886/master 
日志相关修改
 2016-08-13 17:54:40 +08:00
Syrone Wong 2fafc52def Refine encryption(#655) 
* Refine encryption

- Add AES-CTR, blowfish and camellia ciphers

aes-256-ctr
aes-192-ctr
aes-128-ctr
bf-cfb
camellia-128-cfb
camellia-192-cfb
camellia-256-cfb

- Merge the previous PolarSSL and MbedTLS
- Switch to MbedTLS's cipher layer functions
- Add workaround to set cipher operation(encrypt/decrypt)

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>

* Add function to get MbedTLS cipher context size

and drop hard-coded ctx sizes

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-13 14:28:09 +08:00
金黎明 81188103f2 日志清理改为直接清理文件 
日志文件越来越大，原有的清空日志只是清理记录窗口中显示的日志，实际并没有真的删除。
 2016-08-13 10:50:21 +08:00
金黎明 6116388262 日志窗口支持记录最大化显示状态 2016-08-13 09:52:45 +08:00
Syrone Wong 3268c03d21 Seperate strategy and servers menugroup 
User requested.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-11 16:12:35 +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 4795340999 Check whether form handle been created(#650) 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-10 14:15:48 +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
Syrone Wong dc591413ce Merge branch 'dev_proxy' of https://github.com/Noisyfox/shadowsocks-windows into Noisyfox-dev_proxy 2016-08-09 07:45:15 +08: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 3b5d38658f Minor bugfixes (#647) 
* Drop unused variable to suppress warning in LogForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>

* Fix IPv6 displaying

It is a little ugly, send a PR if you can find a better way.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-08 18:49:24 +08:00
Syrone Wong 20b481ecfd Merge PR #566 from @kimw(#646) 2016-08-08 15:44:22 +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
Allen Zhu c8f8ff5277 Fix the System.ObjectDisposedException when closing the LogForm. (#641) 
This exception is caused by processing Invoke Action while trafficChart is already disposed.

=====
Exception reproduce frequency: RARE. Once triggered, ShadowSocks crashes.
 2016-08-06 10:37:20 +08:00
Syrone Wong 382c581365 apply I18N to traffic chart legend (#636) 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-05 16:43:53 +08:00
Allen Zhu b0f71c43f5 Add traffic chart and traffic icon support (#595) 
* Implement the line chart on Log View window for inbound/outbound traffic per second

* Implement dynamic tray icon to indicate Inbound and Outbound

* Refine linechart

* Bugfix for dynamic icon

* Refine chart presentation

* Change the data points' type for more accurate calculation

* Tweak inbound/outbound indicator image for tray icon
 2016-08-04 17:32:56 +08:00
noisyfox 2307c9515e add proxy settings 2016-06-29 18:21:11 +08:00
Gang Zhuo 0b0edb31d1 Merge pull request #592 from Arthur2e5/patch-1 
"Server IP" -> "Server Addr"
 2016-06-15 17:30:44 +08:00
Mingye Wang 5916592234 "Server IP" -> "Server Addr" 2016-06-15 15:34:35 +08:00
kimw ba7bfc4a82 fixed code indent 2016-05-14 10:40:20 -04:00
kimw 3f8d5b415b fixed password mask 2016-05-14 05:24:25 -04:00
everyx c1fd3f3035 take @laincat's advice 2016-03-15 21:06:44 +08:00
everyx 22d081f72e improve tray icon color 2016-03-14 22:04:16 +08:00
everyx 45aaaa6ed9 update function name 2016-03-13 23:54:56 +08:00
everyx 1d5854dfa7 feature #490 2016-03-13 23:50:19 +08:00
Gang Zhuo 93b9e1b158 remove debug code 2016-03-02 22:07:19 +08:00
Gang Zhuo 87ff1c158d fix first run check update 2016-03-02 20:37:10 +08:00
icylogic 8f175c481e filter out meanless data. 2016-03-01 22:25:32 +08: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 7a3f946913 fix databinding 2016-03-01 11:06:09 +08:00
icylogic e0e0f646b0 fix the chart 2016-03-01 00:38:43 +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 687f397ae3 using StringEx 2016-02-06 12:47:45 +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 ce67551d31 migrate to record data model 2016-01-19 01:46:21 +08:00
kimw 1ee07d196a save bandwidth in config file per shadowsocks server 2016-01-10 10:23:58 +08:00
kimw 937171996a name the variable better: rename LogFile => LogFilePath 2016-01-10 05:22:20 +08:00
kimw 6f38bbb1d3 fixed 0 bytes will not show up, and, corrected function name 2016-01-05 04:49:17 +08:00
kimw c2095b5ad7 migrated SimpleJson => Newtonesoft.Json, and of cause removed SimpleJson source files. 2016-01-05 03:45:26 +08:00
kimw b813d9eebc featured middle click on tray pops up log viewer 2016-01-04 23:58:24 +08:00
kimw 2cce646700 featured show bandwidth in log form's title 2016-01-04 23:21:53 +08:00
kimw 0b16ef7445 Merge upstream 
# Conflicts:
#	README.md
#	shadowsocks-csharp/Controller/Service/AvailabilityStatistics.cs
#	shadowsocks-csharp/Controller/Service/PACServer.cs
#	shadowsocks-csharp/Controller/Strategy/SimplyChooseByStatisticsStrategy.cs
#	shadowsocks-csharp/Data/cn.txt
#	shadowsocks-csharp/Model/Configuration.cs
#	shadowsocks-csharp/Model/LogViewerConfig.cs
#	shadowsocks-csharp/View/LogForm.Designer.cs
#	shadowsocks-csharp/View/LogForm.cs
#	shadowsocks-csharp/View/MenuViewController.cs
 2016-01-04 09:14:55 +08:00
Syrone Wong 131c4940c6 add chacha20-ietf support with updated libsscrypto 
ChaCha20 with an extended (96 bit) nonce and a 32-bit counter has
been implemented as crypto_stream_chacha20_ietf() from LibSodium 1.0.4

Please refer to https://tools.ietf.org/html/rfc7539 for details.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2015-12-17 18:25:13 +08:00
Gang Zhuo 3d49bc3128 delay check for updates 2015-12-16 23:19:07 +08:00
icylogic 1196696ed7 fix #389: crash on empty statistic data. 2015-12-08 22:53:29 +08:00
Gang Zhuo 1097d4fc5b remove space by trim() 2015-11-20 22:49:42 +08:00
Gang Zhuo d24548a04f rm rc4 and table 2015-10-16 04:36:31 -04:00