noisyfox
0266ad9d59
Remove redundant lock.
...
Lock is evil.
This will actually affect the accuracy of GetDelta because
inboundDelta and outboundDelta may be calculated based on
the data collected at different time (eg. UpdateOutbound
get called before Interlocked.Read(ref _outbound)).
But that's not a problem. We can tolerate this little
inaccuracy. Besides, the _inbound, _outbound, _lastInbound
and _lastOutbound will be totally good because we use Interlocked.
2016-09-03 08:57:30 +08:00
Syrone Wong
f70b177e56
Misc
...
Signed-off-by: Syrone Wong <wong.syrone@gmail.com >
2016-08-29 21:30:05 +08:00
noisyfox
5b2327776a
Fix a null ref exception.
2016-08-27 03:35:33 +10:00
noisyfox
ed54b249db
Close services while closing listener.
...
Now it will close all existing TCP relay connections
while reloading the listener.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-26 21:08:04 +10:00
noisyfox
65d72fdfed
New approach to record and calculate inbound/outbound speed.
...
Use lock to sync between threads.This should fix issue #679
and other same issue.
Fix a bug in UpdateSpeed() that only save the first xxxSpeedRecord.
2016-08-26 13:49:44 +10:00
noisyfox
a7b0ce5bcb
Use atomic long read.
...
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-26 12:23:21 +10:00
noisyfox
37d894594e
Use immutable remote reference during async process.
...
To prevent "The IAsyncResult object was not returned from
the corresponding asynchronous method on this class." exception.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-22 11:49:53 +10:00
noisyfox
28fe2fdc54
Only output some debug exceptions in debug mode.
...
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-22 10:53:18 +10:00
noisyfox
f676d2185e
Use Socket.ConnectAsync instead of socket.BeginConnect.
...
Socket.ConnectAsync will create socket and handle the address family
itself. This solves some compatibility issues on win7.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-20 11:36:27 +10:00
noisyfox
b335e6c8f5
Revert changes in UDPRelay.cs
...
UDP SendTo doesn't support DnsEndPoint.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-20 11:33:59 +10:00
noisyfox
80fc8b4ccf
Fix an exception caused by process.MainModule.
...
Try to access a dead process's MainModule will cause
"A 32 bit processes cannot access modules of
a 64 bit process." exception on win7 x64.
Simply ignore it.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-20 10:57:13 +10:00
noisyfox
2ed8ab50cd
Only parse socks5 header once per connection.
...
To avoid unreadable and uncessary output
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-19 13:36:49 +10:00
Noisyfox
a1eef6eac1
Multiple instances of ss_privoxy ( #665 )
...
* Use job object to manage polipo service's external processes.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
* Only kill those ss_privoxy.exe created by this ss instance.
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
* Update README
Signed-off-by: noisyfox <timemanager.rick@gmail.com >
2016-08-18 19:31:01 +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
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
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
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
金黎明
81188103f2
日志清理改为直接清理文件
...
日志文件越来越大，原有的清空日志只是清理记录窗口中显示的日志，实际并没有真的删除。
2016-08-13 10:50:21 +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
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
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 e280c2385c579039f87aa9ebgang.zhuo@gmail.com >
Date: Wed Mar 16 04:02:27 2016 -0400
Merge remote-tracking branch 'origin/master'
commit 579039fe40gang.zhuo@gmail.com >
Date: Fri Mar 4 21:45:23 2016 +0800
log unhandle exception
commit 8d863f1d5fgang.zhuo@gmail.com >
Date: Fri Mar 4 21:44:54 2016 +0800
fix Availability Statistics
commit b3ce1c698agang.zhuo@gmail.com >
Date: Fri Mar 4 21:07:54 2016 +0800
tiny refactor
commit 0f7d39e27ebd7078ab01acedgang.zhuo@gmail.com >
Date: Fri Mar 4 20:02:58 2016 +0800
Merge remote-tracking branch 'origin/master'
commit bd7078aa4fgang.zhuo@gmail.com >
Date: Fri Mar 4 20:01:58 2016 +0800
tiny refactor
commit 49adb95b6egang.zhuo@gmail.com >
Date: Fri Mar 4 03:44:26 2016 -0500
log more Ping information for debug
commit 2aa0620dddgang.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
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
d310377c49
Merge pull request #551 from kimw/disable_statistics
...
Disable StatisticsStrategy by default.
2016-06-15 16:45:32 +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
Mygod
9c7b100f2b
Support one-time authentication in ss urls for sharing
...
This commit implements the new ss protocol proposed here:
https://github.com/shadowsocks/shadowsocks-org/issues/16
Also removes a TODO in Server.cs. You are welcome.
2016-04-15 23:12:39 +08: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
a486514afb
Conditional compile
2016-03-02 02:56:41 -05:00
Gang Zhuo
a9589dba8b
bump 3.0
2016-03-01 21:24:30 -05:00
icylogic
65e12e43c9
make hints more friendly.
2016-03-01 23:06:21 +08:00
icylogic
11066b7581
in case of broken configs
2016-03-01 22:43:38 +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
noisyfox
Syrone Wong
金黎明
Noisyfox He
Allen Zhu
Gang Zhuo
kimw
Mygod
icylogic