freewifi 0.1.8 → 0.2.3
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.
- checksums.yaml +4 -4
- data/.idea/freewifi.iml +22 -3
- data/.idea/runConfigurations/get_iwag_data.xml +21 -0
- data/.idea/workspace.xml +356 -214
- data/lib/freewifi.rb +94 -31
- data/lib/freewifi/additional/additional_functions.rb +19 -0
- data/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb +2 -1
- data/lib/freewifi/cisco/iwag/get_iwag_data.rb +91 -0
- data/lib/freewifi/cisco/iwag/iwag_database_worker.rb +24 -0
- data/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb +19 -5
- data/lib/freewifi/config.rb +1 -0
- data/lib/freewifi/database/mongo/mongoconnector.rb +1 -1
- data/lib/freewifi/general/wifi_portal_procedures.rb +774 -388
- data/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb +2 -0
- data/lib/freewifi/mikrotik/newhub_mtik_api.rb +4 -2
- data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb +2 -2
- data/lib/freewifi/version.rb +1 -1
- metadata +10 -6
@@ -12,6 +12,7 @@ class NEWhubWifiApi_1
|
|
12
12
|
|
13
13
|
|
14
14
|
def get_info_subs_from_mik_1(subs_mac, controllers_ip)
|
15
|
+
input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
|
15
16
|
#region get additional information
|
16
17
|
|
17
18
|
subscribers_mac = subs_mac
|
@@ -30,7 +31,8 @@ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
|
|
30
31
|
mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
|
31
32
|
|
32
33
|
req.reply.each do |reply|
|
33
|
-
if reply.key?('
|
34
|
+
if reply.key?('mac-address')
|
35
|
+
#p reply
|
34
36
|
if reply['mac-address'] == subscribers_mac
|
35
37
|
|
36
38
|
access_point = reply['interface']
|
@@ -90,7 +92,7 @@ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
|
|
90
92
|
#endregion
|
91
93
|
answ = subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
|
92
94
|
|
93
|
-
|
95
|
+
answ
|
94
96
|
|
95
97
|
end
|
96
98
|
|
@@ -243,9 +243,9 @@ class NEWhubWifi_1
|
|
243
243
|
conf_5ghz_name = "auto_cfg_5ghz_#{companyname}_#{wifissid}"
|
244
244
|
command_conf_5ghz = "/caps-man configuration add name=#{conf_5ghz_name} ssid=#{wifissid} country=belarus mode=ap hw-retries=15 channel=5_channel_5GHz_number1_power23 datapath=1_datapath_MTS_Local-forwarding security=security_without_passphrase_default_FREE-WiFi"
|
245
245
|
|
246
|
-
command_provisioning_24ghz = "/caps-man provisioning add hw-supported-modes=b,g,gn ip-address-ranges=#{ap_ip} action=create-dynamic-enabled master-configuration=#{conf_24ghz_name} name-format=identity"
|
246
|
+
command_provisioning_24ghz = "/caps-man provisioning add hw-supported-modes=b,g,gn ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
|
247
247
|
|
248
|
-
command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled master-configuration=#{conf_24ghz_name} name-format=identity"
|
248
|
+
command_provisioning_5ghz = "/caps-man provisioning add hw-supported-modes=a,ac,an ip-address-ranges=#{ap_ip} action=create-dynamic-enabled place-before=30 master-configuration=#{conf_24ghz_name} name-format=identity"
|
249
249
|
|
250
250
|
Net::SSH.start(capsman1, capsman_user1, :password => capsman_pass1) do |ssh|
|
251
251
|
result = ssh.exec!(command_conf_24ghz)
|
data/lib/freewifi/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: freewifi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.2.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dzmitry Buynovskiy
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-09-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -204,6 +204,7 @@ files:
|
|
204
204
|
- ".idea/inspectionProfiles/Project_Default.xml"
|
205
205
|
- ".idea/misc.xml"
|
206
206
|
- ".idea/modules.xml"
|
207
|
+
- ".idea/runConfigurations/get_iwag_data.xml"
|
207
208
|
- ".idea/vcs.xml"
|
208
209
|
- ".idea/workspace.xml"
|
209
210
|
- ".travis.yml"
|
@@ -218,12 +219,15 @@ files:
|
|
218
219
|
- lib/freewifi.rb
|
219
220
|
- lib/freewifi/additional/additional_functions.rb
|
220
221
|
- lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb
|
222
|
+
- lib/freewifi/cisco/iwag/get_iwag_data.rb
|
223
|
+
- lib/freewifi/cisco/iwag/iwag_database_worker.rb
|
221
224
|
- lib/freewifi/cisco/iwag/iwag_telnet_connector.rb
|
222
225
|
- lib/freewifi/config.rb
|
223
226
|
- lib/freewifi/database/mongo/mongoconnector.rb
|
224
227
|
- lib/freewifi/database/mysql/database_methods_wifi.rb
|
225
228
|
- lib/freewifi/general/wifi_portal_procedures.rb
|
226
229
|
- lib/freewifi/huawei/hua_controller_class.rb
|
230
|
+
- lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb
|
227
231
|
- lib/freewifi/mikrotik/getsubscribermikrotik.rb
|
228
232
|
- lib/freewifi/mikrotik/newhub_mtik_api.rb
|
229
233
|
- lib/freewifi/mikrotik/newhub_mtik_ssh.rb
|
@@ -235,7 +239,7 @@ licenses:
|
|
235
239
|
- MIT
|
236
240
|
metadata:
|
237
241
|
allowed_push_host: https://rubygems.org/
|
238
|
-
post_install_message:
|
242
|
+
post_install_message:
|
239
243
|
rdoc_options: []
|
240
244
|
require_paths:
|
241
245
|
- lib
|
@@ -250,9 +254,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
250
254
|
- !ruby/object:Gem::Version
|
251
255
|
version: '0'
|
252
256
|
requirements: []
|
253
|
-
rubyforge_project:
|
257
|
+
rubyforge_project:
|
254
258
|
rubygems_version: 2.6.14
|
255
|
-
signing_key:
|
259
|
+
signing_key:
|
256
260
|
specification_version: 4
|
257
261
|
summary: gem for Public WiFi
|
258
262
|
test_files: []
|