shadowsocks 0.11 → 0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/config.json +2 -2
  3. data/lib/shadowsocks/server.rb +7 -1
  4. data/lib/shadowsocks/version.rb +1 -1
  5. data/shadowsocks.gemspec +6 -6
  6. data/tasks/chnroutes.rake +0 -1
  7. metadata +48 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 13cd39701958e9cbe3c1aa72e2f4037becf509d6
4
- data.tar.gz: f1d90a849085aec7408ce5f09e0e2f8e8a2cd350
3
+ metadata.gz: d878ef4c4b348bbc1b52c2555636cfaf41e59079
4
+ data.tar.gz: 7a4f496d27d36dac94d25ac093fc8c431cda5243
5
5
  SHA512:
6
- metadata.gz: 688d4af6514d67b927edfcac45958619d844c07ad48473a7174ac84c34bf9625ffbe26ad0151a7a6e6c6625c683d58c4f8050d99cf64713614a6f53209d64122
7
- data.tar.gz: 54a763dc6a4078a4fdff3b2bb4735139795b03e9f1cb9635e46110d32846125d9c2fb311dec77c2632be518a14595c1fe4eabea7fb2f4023aa80a299208a608a
6
+ metadata.gz: dd7406adb53b99f4b35c32bc46aaaffd7f8a1149298ab816b8c1feef1f2b6fd873f7fbbc49b86ddb200616a2a08784bcfe5b389d54897a4d527debd801a127cd
7
+ data.tar.gz: 2ae7e5369ea7f38beaa8faf343eed91c4bd7d70b44bbb9ea2033437ba4eeac7aa2d932fcb8347f667cfad7e8d3649ff051b001411efe94f84c00847bc0e20170
data/config.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
- "server":"162.243.140.72",
2
+ "server":"127.0.0.1",
3
3
  "server_port":8388,
4
4
  "local_port":1080,
5
- "password":"marryrocks",
5
+ "password":"barfoo!",
6
6
  "timeout":60,
7
7
  "method":"aes-128-cfb",
8
8
  "chnroutes":true
data/lib/shadowsocks/server.rb CHANGED
@@ -20,7 +20,13 @@ module Shadowsocks
20
20
  private
21
21
 
22
22
  def data_handler data
23
- data = decrypt data
23
+ begin
24
+ data = decrypt data
25
+ rescue Exception => e
26
+ warn e
27
+ connection_cleanup
28
+ end
29
+
24
30
  case stage
25
31
  when 0
26
32
  fireup_tunnel data
data/lib/shadowsocks/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Shadowsocks
2
- VERSION = '0.11'
2
+ VERSION = '0.12'
3
3
  end
data/shadowsocks.gemspec CHANGED
@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
15
15
  s.license = 'MIT'
16
16
  s.extensions = %w[ext/encrypt/extconf.rb]
17
17
 
18
- s.add_dependency "eventmachine", "~> 1.0.3"
19
- s.add_dependency "json", "~> 1.8.0"
20
- s.add_dependency "ffi", "~> 1.9.0"
18
+ s.add_dependency "eventmachine", '~> 1.0', '>= 1.0.3'
19
+ s.add_dependency "json", '~> 1.8', '>= 1.8.0'
20
+ s.add_dependency "ffi", '~> 1.9', '>= 1.9.0'
21
21
 
22
- s.add_development_dependency "rake-compiler", "~> 0.9.2"
23
- s.add_development_dependency "mocha", "~> 1.0.0"
24
- s.add_development_dependency "rake"
22
+ s.add_development_dependency "rake-compiler", '~> 0.9', '>= 0.9.2'
23
+ s.add_development_dependency "mocha", '~> 1.0', '>= 1.0.0'
24
+ s.add_development_dependency "rake", '~> 0'
25
25
  end
data/tasks/chnroutes.rake CHANGED
@@ -1,5 +1,4 @@
1
1
  require 'ipaddr'
2
- require 'ipaddress'
3
2
  require 'benchmark'
4
3
 
5
4
  task :fetch_chnroutes do
metadata CHANGED
@@ -1,97 +1,127 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: shadowsocks
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.11'
4
+ version: '0.12'
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-13 00:00:00.000000000 Z
11
+ date: 2014-07-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eventmachine
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: '1.0'
20
+ - - ">="
18
21
  - !ruby/object:Gem::Version
19
22
  version: 1.0.3
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - ~>
27
+ - - "~>"
28
+ - !ruby/object:Gem::Version
29
+ version: '1.0'
30
+ - - ">="
25
31
  - !ruby/object:Gem::Version
26
32
  version: 1.0.3
27
33
  - !ruby/object:Gem::Dependency
28
34
  name: json
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - ~>
37
+ - - "~>"
38
+ - !ruby/object:Gem::Version
39
+ version: '1.8'
40
+ - - ">="
32
41
  - !ruby/object:Gem::Version
33
42
  version: 1.8.0
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
38
- - - ~>
47
+ - - "~>"
48
+ - !ruby/object:Gem::Version
49
+ version: '1.8'
50
+ - - ">="
39
51
  - !ruby/object:Gem::Version
40
52
  version: 1.8.0
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: ffi
43
55
  requirement: !ruby/object:Gem::Requirement
44
56
  requirements:
45
- - - ~>
57
+ - - "~>"
58
+ - !ruby/object:Gem::Version
59
+ version: '1.9'
60
+ - - ">="
46
61
  - !ruby/object:Gem::Version
47
62
  version: 1.9.0
48
63
  type: :runtime
49
64
  prerelease: false
50
65
  version_requirements: !ruby/object:Gem::Requirement
51
66
  requirements:
52
- - - ~>
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: '1.9'
70
+ - - ">="
53
71
  - !ruby/object:Gem::Version
54
72
  version: 1.9.0
55
73
  - !ruby/object:Gem::Dependency
56
74
  name: rake-compiler
57
75
  requirement: !ruby/object:Gem::Requirement
58
76
  requirements:
59
- - - ~>
77
+ - - "~>"
78
+ - !ruby/object:Gem::Version
79
+ version: '0.9'
80
+ - - ">="
60
81
  - !ruby/object:Gem::Version
61
82
  version: 0.9.2
62
83
  type: :development
63
84
  prerelease: false
64
85
  version_requirements: !ruby/object:Gem::Requirement
65
86
  requirements:
66
- - - ~>
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: '0.9'
90
+ - - ">="
67
91
  - !ruby/object:Gem::Version
68
92
  version: 0.9.2
69
93
  - !ruby/object:Gem::Dependency
70
94
  name: mocha
71
95
  requirement: !ruby/object:Gem::Requirement
72
96
  requirements:
73
- - - ~>
97
+ - - "~>"
98
+ - !ruby/object:Gem::Version
99
+ version: '1.0'
100
+ - - ">="
74
101
  - !ruby/object:Gem::Version
75
102
  version: 1.0.0
76
103
  type: :development
77
104
  prerelease: false
78
105
  version_requirements: !ruby/object:Gem::Requirement
79
106
  requirements:
80
- - - ~>
107
+ - - "~>"
108
+ - !ruby/object:Gem::Version
109
+ version: '1.0'
110
+ - - ">="
81
111
  - !ruby/object:Gem::Version
82
112
  version: 1.0.0
83
113
  - !ruby/object:Gem::Dependency
84
114
  name: rake
85
115
  requirement: !ruby/object:Gem::Requirement
86
116
  requirements:
87
- - - '>='
117
+ - - "~>"
88
118
  - !ruby/object:Gem::Version
89
119
  version: '0'
90
120
  type: :development
91
121
  prerelease: false
92
122
  version_requirements: !ruby/object:Gem::Requirement
93
123
  requirements:
94
- - - '>='
124
+ - - "~>"
95
125
  - !ruby/object:Gem::Version
96
126
  version: '0'
97
127
  description: shadowsocks-ruby is a lightweight tunnel proxy which can help you get
@@ -104,7 +134,7 @@ extensions:
104
134
  - ext/encrypt/extconf.rb
105
135
  extra_rdoc_files: []
106
136
  files:
107
- - .gitignore
137
+ - ".gitignore"
108
138
  - Gemfile
109
139
  - Gemfile.lock
110
140
  - README.md
@@ -144,17 +174,17 @@ require_paths:
144
174
  - lib
145
175
  required_ruby_version: !ruby/object:Gem::Requirement
146
176
  requirements:
147
- - - '>='
177
+ - - ">="
148
178
  - !ruby/object:Gem::Version
149
179
  version: '0'
150
180
  required_rubygems_version: !ruby/object:Gem::Requirement
151
181
  requirements:
152
- - - '>='
182
+ - - ">="
153
183
  - !ruby/object:Gem::Version
154
184
  version: '0'
155
185
  requirements: []
156
186
  rubyforge_project:
157
- rubygems_version: 2.0.14
187
+ rubygems_version: 2.2.2
158
188
  signing_key:
159
189
  specification_version: 4
160
190
  summary: ruby version of shadowsocks