Commit Graph
120 Commits
Author SHA1 Message Date
Syrone Wong af139d7587 Only integer is allowed for timeout
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-10-07 08:57:55 +08:00
Syrone Wong 04ed25e16f Add timeout support for server and forward proxy
Also, fix typo in ProxyForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-10-06 21:03:45 +08:00
Syrone Wong 3ba5c491d2 Update libsscrypto
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-10-03 18:56:00 +08:00
Syrone Wong 4bd9fd8a6b Replace treewide polipo with privoxy
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-28 16:35:51 +08:00
Noisyfox 35fc73b58b Add HTTP proxy support in forward proxy (#745)
* Add HTTP proxy support in forward proxy

Signed-off-by: noisyfox <timemanager.rick@gmail.com>

* Typo

* Throw exception if forward proxy not supported.
2016-09-24 23:37:24 -05:00
Syrone Wong 78957e29d6 Refine traditional Chinese translation
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-19 09:09:29 +08:00
Syrone Wong ef17b72d25 Refine PR #730
Squashed commit of the following:

commit 48eb4d88391b85986190ace825ec0a167df16f8a
Author: Syrone Wong <wong.syrone@gmail.com>
Date:   Sun Sep 18 15:46:09 2016 +0800

    Drop useless interface impl

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

commit c0a4f3421a
Author: Logan Zhou <xorcererzc@gmail.com>
Date:   Sun Sep 18 00:58:02 2016 +0800

    Revert "Updated to meet the hint from Wongsyrone."

    This reverts commit 84c8053577.

commit 84c8053577
Author: Logan Zhou <xorcererzc@gmail.com>
Date:   Sun Sep 18 00:52:21 2016 +0800

    Updated to meet the hint from Wongsyrone.

commit 333ccb6d1f
Author: Logan Zhou <xorcererzc@gmail.com>
Date:   Sun Sep 18 00:34:52 2016 +0800

    Added duplicate button to config form.

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-18 16:06:00 +08:00
破娃酱 d284cd04e8 Set the newline mode to CRLF 2016-09-17 20:01:08 +08:00
Syrone Wong 99bdec334c Add global hotkey support (#724)
Design:

Use the plain string for both config and hotkey parsing
and make use of KeyConverter, ModifierKeysConverter
to make it more rubust.

Find corresponding label (to display operation result) and callback (to do the real work) based on textbox name. In this case, they should be named as `<Feature-Name><Control-Name>`.

ShowLogsTextBox,
ShowLogsLabel,
ShowLogsCallback.

If this requirement doesn't meet, throw an exception at runtime.

Logic:

How to input keys:
1. put focus in the corresponding textbox
2. press the key combination you want to use
3. when you think it is ready, release all keys
4. the textbox shows your input

How to change keys:
1. put focus in the corresponding textbox
2. press BackSpace to clear content
3. re-input new one

How to deactivate:
1. clear content in the textbox
2. press OK button

Meaning of label color:
- Green: this combination is not occupied by other programs and register successfully
- Yellow: this combination is occupied by other programs and you have to change to another one
- Transparent without color: initial status

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-16 23:42:16 -05:00
破娃酱 a9cf3992e1 Refine traditional Chinese translation (#716) 2016-09-13 21:27:22 -05:00
Syrone Wong bb7171674b Refine traditional Chinese translation again
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-07 10:08:56 +08:00
Syrone Wong 3b1ac7500f typo
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-07 09:54:35 +08:00
Syrone Wong 2bebe515fa Refine traditional Chinese translation
- Respect shadowsocks-android translation by @LNDDYL
- pretend to be native speaker

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-09-07 09:49:56 +08:00
破娃酱 da234ef857 add Traditional Chinese (#698)
* add Traditional Chinese

* fix a resource type

* fix the Traditional Chinese name of "address", "port", "screen", "Open Location"
2016-09-06 11:39:05 +08:00
Syrone Wong cbc94e0eb7 Update privoxy to 3.0.26
Close #686

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-29 21:30:38 +08:00
Syrone Wong acf7963de7 OTA is stable now
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-08-17 15:52:42 +08:00
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 aef88543d2 Fix typo
Update translate

Signed-off-by: noisyfox <timemanager.rick@gmail.com>
2016-08-16 15:47:55 +10: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
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 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 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 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
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 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 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
Chen Shaoju e217143c27 Update cn.txt (2)
Fix.
2016-06-15 17:16:15 +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
Syrone Wong 89a9b49e35 Simplify MD5 handling
- use mbedtls_md5() instead
- update libsscrypto

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-05-28 00:12:02 +08:00
Gang Zhuo 4bdd864d2f Merge pull request #456 from wongsyrone/privoxy-3.0.24
update privoxy to 3.0.24
2016-03-02 09:49:48 +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
Syrone Wong 72046973ed update privoxy to 3.0.24
The executable was modified based on official release version, which
prevents privoxy from showing tray icon.
jmp dword ptr [<&SHELL32.Shell_NotifyIconA>]  => nop

This should close #455

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
2016-03-01 18:35:24 +08:00
Bigtan d23af40fa1 add statistics config translation
add statistics config translation
2016-01-12 17:49:10 +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 dd0d047402 override MD5, so compatible with FIPS 2015-11-23 23:52:54 +08:00
ayanamist ad75e4fd9c Update privoxy_conf.txt
use __POLIPO_BIND_PORT__ to avoid potential port conflict
2015-11-12 13:46:10 +08:00
Gang Zhuo c5e27486fb Protocol V2 2015-09-25 04:03:04 -04:00
Gang Zhuo d0518e5a11 typo 2015-09-24 00:34:48 -04:00
Gang Zhuo 3aac1cfcfc Refine the authentication for true CCA 2015-09-23 02:08:41 -04:00
kimw b632d4a8a9 improved log viewer:
1. add menu items for `clear logs`, `change fonts`, `wrap text` and `top most` functions.
2. hide toolbar default. but you can trigger it out by menu.
2015-09-22 23:15:20 +08:00
Gang Zhuo ab79dbce0e Download updates automatically 2015-09-21 23:41:28 -04:00
Gang Zhuo 00ccb52bef Add an option for checking updates 2015-09-21 22:42:16 -04:00
Gang Zhuo 204d6b856e verbiage 2015-09-21 05:28:18 -04:00
Gang Zhuo 19085a3cd1 Update the hash function
follow with https://github.com/shadowsocks/shadowsocks-libev/commit/5ae4df94e440c4f6826a679a62687ad27303d89b
2015-09-20 23:25:37 -04:00
Gang Zhuo ab1f366049 Combine libsscrypto.dll and libsslcrypto2.dll 2015-09-20 15:13:13 +08:00
Gang Zhuo 1564e9ff81 support onetime auth 2015-09-20 15:13:11 +08:00
kimw cec6f79e7e improved log viewer:
1. add `clean log` feature
2. add `change font` feature
3. add `wrap text` feature
4. add `top most` feature
2015-08-19 21:52:16 +08:00