Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
795 Commits 7 Branches 37 Tags
3417a984fa81dc89d984aa3fd3728e90a92d79fb
Commit Graph
795 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Syrone Wong 3417a984fa Change requirements 
- Running on Windows Vista or above

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-17 11:13:25 +08:00
noisyfox 6cb58b229d Fix a null ref exception. 
At that time the remote even doesn't exist.
Also this debug output doesn't make any sense because when handling
udp request, this tcp connection won't have any meaningful data.
So I simply removed these two lines.

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
 2016-08-16 20:52:53 +10:00
noisyfox 53ce1948e4 Unified ipv4, ipv6 and domain connections. 
-Use dual-mode socket & DnsEndPoint to handle all domain name connection.
-Move all socket creation into one single function.

So that we could treat domain name just like ipv4 & ipv6 address.
This also solves the async domain solving problem because the os will
hanlde it for us.
 2016-08-16 20:40:09 +10:00
noisyfox ad15c7e64b Improve host address handling using DnsEndPoint 
Signed-off-by: noisyfox <timemanager.rick@gmail.com>
 2016-08-16 17:28:26 +10:00
noisyfox aef88543d2 Fix typo 
Update translate

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
 2016-08-16 15:47:55 +10:00
noisyfox 22740c5102 Let Socks5 proxy handle server host's domain name. 
Don't resolve it locally because socks5 support domain name connection.

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
 2016-08-16 02:10:38 +10:00
noisyfox a02cd11dc9 Let proxy module handle name resolving itself. 
Fix wrong output in proxyConnectTimer_Elapsed.

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
 2016-08-16 01:11:33 +10:00
Syrone Wong 21618ef08d Cleanup 
- Drop redundant code.
  I should read code carefully, mbed TLS will set operation
  when invoking mbedtls_cipher_setkey(), the last param
  const mbedtls_operation_t operation is what we want.
- minor changes

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-14 22:29:48 +08:00
Syrone Wong e15e2cf700 Update CHANGES 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-14 22:28:50 +08:00
Syrone Wong 5d554d966a Bump version and update CHANGES 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
3.2 		2016-08-13 19:01:15 +08:00
Syrone Wong d67b94c76b Minor changes 
- Revert UncompressFile() changes
- Simplify code

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-13 18:12:11 +08:00
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 6a552a03d0 Fix typo 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-11 10:06:58 +08:00
Syrone Wong ebd6f8f538 Update NuGet packages 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-11 09:31:46 +08:00
Syrone Wong 6a26436850 Refine Windows registry handling(#512) 
- Added a util function to handle x86 and x64
  currently, we only handle keys in HKCU
- Close registry key after operations

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-10 17:42:37 +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 a4fead74db Update libsscrypto 
- update libsodium to tagged 1.0.11
- update mbedtls to tagged 2.3.0

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-10 15:24:52 +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 50de65624c Refine user-friendly server name 
Forgot to consider domain name.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-10 13:49:17 +08:00
Syrone Wong 9607751bf8 Merge PR #604 from @Noisyfox(#649) 2016-08-09 08:43:58 +08:00
Syrone Wong 4fcddc3e82 Check server IP address validity and log it 
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
 2016-08-09 08:32:16 +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 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 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 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
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
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
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 4a1aa01a4f Enable proxy switch 2016-06-30 00:09:45 +08:00
noisyfox 9493f93c0f Add Socks5 Proxy 2016-06-30 00:09:20 +08:00
noisyfox 95d4e3a0c0 Add proxy support 2016-06-29 22:38:51 +08:00
noisyfox 2307c9515e add proxy settings 2016-06-29 18:21:11 +08:00
Gang Zhuo 31f6864e20 Merge pull request #580 from wongsyrone/master 
Simplify MD5 handling
 2016-06-15 18:41:32 +08:00
Gang Zhuo 977ae5c513 Merge pull request #593 from chenshaoju/patch-1 
Update cn.txt
 2016-06-15 17:31:05 +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
Chen Shaoju e217143c27 Update cn.txt (2) 
Fix.
 2016-06-15 17:16:15 +08:00
Gang Zhuo d310377c49 Merge pull request #551 from kimw/disable_statistics 
Disable StatisticsStrategy by default.
 2016-06-15 16:45:32 +08:00
Gang Zhuo 39bdb34892 Merge pull request #565 from kimw/fix_password_mask 
fixed password mask
 2016-06-15 16:44:02 +08:00
Chen Shaoju 7275eee88d Update cn.txt 
Use new string in https://github.com/shadowsocks/shadowsocks-windows/pull/592
 2016-06-15 16:24:34 +08:00