freewifi 0.1.9 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.idea/workspace.xml +42 -42
  3. data/lib/freewifi.rb +3 -2
  4. data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb +2 -2
  5. data/lib/freewifi/version.rb +1 -1
  6. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7ccfed2575d31871127438ba592d6875f3a4beb4
4
- data.tar.gz: 92f34f8669d80688a628d2c2db2bbd02ed3f3558
3
+ metadata.gz: 328d9b7cc5e168cf4a9c0337c2beb3f2ba68843e
4
+ data.tar.gz: c86865d233125d7cf3a526bbecd99718fda689a7
5
5
  SHA512:
6
- metadata.gz: 40373f41bc28352a37b0846a6e46bbb69276028a6a90978c52d286033221d5a9cee23394a0e237e53e9daa0712f1b820f5f50d694e38b76593ef89246402a008
7
- data.tar.gz: 9b9e0ae1a47fb4334c9296e766d26dd088cc38f43ca7451f395c86d2383bd1a78d94f45a6e510b290632370819d0c65ef4fe11733b6f510c4669300c603dc051
6
+ metadata.gz: 297b7cea12a6d3e6c1409e711572a0f38a899fa0af453bc1e4bdbb068e0b3acf6f902b653e88d2ab58a057969fb68a4f47d48fe7a26dd76aa1a150b8a29c8492
7
+ data.tar.gz: 198463e06b7c936bfde1a7ba7c7458d3279e3c9768b29ff6c6fa441b6d1a70d28c146703a6d465312a8e05694c7fae03ee7316cbeb5d0cc48f549189618464dc
data/.idea/workspace.xml CHANGED
@@ -57,8 +57,8 @@
57
57
  <file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="true">
58
58
  <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
59
59
  <provider selected="true" editor-type-id="text-editor">
60
- <state relative-caret-position="812">
61
- <caret line="355" column="41" lean-forward="true" selection-start-line="355" selection-start-column="33" selection-end-line="355" selection-end-column="46" />
60
+ <state relative-caret-position="375">
61
+ <caret line="358" column="12" lean-forward="true" selection-start-line="358" selection-start-column="12" selection-end-line="358" selection-end-column="12" />
62
62
  <folding />
63
63
  </state>
64
64
  </provider>
@@ -67,8 +67,8 @@
67
67
  <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
68
68
  <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
69
69
  <provider selected="true" editor-type-id="text-editor">
70
- <state relative-caret-position="421">
71
- <caret line="73" column="2" lean-forward="false" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="2" />
70
+ <state relative-caret-position="346">
71
+ <caret line="68" column="0" lean-forward="false" selection-start-line="68" selection-start-column="0" selection-end-line="69" selection-end-column="14" />
72
72
  <folding />
73
73
  </state>
74
74
  </provider>
@@ -78,7 +78,7 @@
78
78
  <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
79
79
  <provider selected="true" editor-type-id="text-editor">
80
80
  <state relative-caret-position="-242">
81
- <caret line="38" column="9" lean-forward="true" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
81
+ <caret line="38" column="9" lean-forward="false" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
82
82
  <folding />
83
83
  </state>
84
84
  </provider>
@@ -87,8 +87,8 @@
87
87
  <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
88
88
  <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
89
89
  <provider selected="true" editor-type-id="text-editor">
90
- <state relative-caret-position="15">
91
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
90
+ <state relative-caret-position="45">
91
+ <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
92
92
  <folding />
93
93
  </state>
94
94
  </provider>
@@ -107,7 +107,7 @@
107
107
  <file leaf-file-name="schemes_conf_gen.rb" pinned="false" current-in-tab="false">
108
108
  <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
109
109
  <provider selected="true" editor-type-id="text-editor">
110
- <state relative-caret-position="15">
110
+ <state relative-caret-position="427">
111
111
  <caret line="30" column="5" lean-forward="false" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
112
112
  <folding />
113
113
  </state>
@@ -117,8 +117,8 @@
117
117
  <file leaf-file-name="newhub_mtik_ssh.rb" pinned="false" current-in-tab="false">
118
118
  <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
119
119
  <provider selected="true" editor-type-id="text-editor">
120
- <state relative-caret-position="2439">
121
- <caret line="235" column="5" lean-forward="false" selection-start-line="235" selection-start-column="5" selection-end-line="235" selection-end-column="5" />
120
+ <state relative-caret-position="237">
121
+ <caret line="248" column="0" lean-forward="true" selection-start-line="248" selection-start-column="0" selection-end-line="248" selection-end-column="0" />
122
122
  <folding />
123
123
  </state>
124
124
  </provider>
@@ -137,7 +137,7 @@
137
137
  <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
138
138
  <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
139
139
  <provider selected="true" editor-type-id="text-editor">
140
- <state relative-caret-position="357">
140
+ <state relative-caret-position="-127">
141
141
  <caret line="122" column="15" lean-forward="false" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="28" />
142
142
  <folding />
143
143
  </state>
@@ -161,7 +161,6 @@
161
161
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/cisco_schemes_conf_gen.rb" />
162
162
  <option value="$PROJECT_DIR$/lib/freewifi/params.rb" />
163
163
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" />
164
- <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
165
164
  <option value="$PROJECT_DIR$/freewifi.gemspec" />
166
165
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" />
167
166
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" />
@@ -171,8 +170,9 @@
171
170
  <option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
172
171
  <option value="$PROJECT_DIR$/test/test_helper.rb" />
173
172
  <option value="$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb" />
174
- <option value="$PROJECT_DIR$/lib/freewifi.rb" />
173
+ <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
175
174
  <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
175
+ <option value="$PROJECT_DIR$/lib/freewifi.rb" />
176
176
  </list>
177
177
  </option>
178
178
  </component>
@@ -666,12 +666,12 @@
666
666
  <workItem from="1587794173933" duration="25602000" />
667
667
  <workItem from="1588004674911" duration="36310000" />
668
668
  <workItem from="1588102169957" duration="432000" />
669
- <workItem from="1588146691256" duration="3148000" />
669
+ <workItem from="1588146691256" duration="3854000" />
670
670
  </task>
671
671
  <servers />
672
672
  </component>
673
673
  <component name="TimeTrackingManager">
674
- <option name="totallyTimeSpent" value="77624000" />
674
+ <option name="totallyTimeSpent" value="78330000" />
675
675
  </component>
676
676
  <component name="ToolWindowManager">
677
677
  <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -1018,82 +1018,82 @@
1018
1018
  </state>
1019
1019
  </provider>
1020
1020
  </entry>
1021
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1021
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
1022
1022
  <provider selected="true" editor-type-id="text-editor">
1023
- <state relative-caret-position="2439">
1024
- <caret line="235" column="5" lean-forward="false" selection-start-line="235" selection-start-column="5" selection-end-line="235" selection-end-column="5" />
1023
+ <state relative-caret-position="450">
1024
+ <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
1025
1025
  <folding />
1026
1026
  </state>
1027
1027
  </provider>
1028
1028
  </entry>
1029
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1029
+ <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.4.1/gems/mongo-2.11.4/lib/mongo/client.rb">
1030
1030
  <provider selected="true" editor-type-id="text-editor">
1031
- <state relative-caret-position="357">
1032
- <caret line="122" column="15" lean-forward="false" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="28" />
1031
+ <state relative-caret-position="243">
1032
+ <caret line="58" column="8" lean-forward="true" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="22" />
1033
1033
  <folding />
1034
1034
  </state>
1035
1035
  </provider>
1036
1036
  </entry>
1037
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
1037
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
1038
1038
  <provider selected="true" editor-type-id="text-editor">
1039
- <state relative-caret-position="450">
1040
- <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
1039
+ <state relative-caret-position="-242">
1040
+ <caret line="38" column="9" lean-forward="false" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
1041
1041
  <folding />
1042
1042
  </state>
1043
1043
  </provider>
1044
1044
  </entry>
1045
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
1045
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
1046
1046
  <provider selected="true" editor-type-id="text-editor">
1047
- <state relative-caret-position="15">
1048
- <caret line="1" column="18" lean-forward="false" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
1047
+ <state relative-caret-position="300">
1048
+ <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
1049
1049
  <folding />
1050
1050
  </state>
1051
1051
  </provider>
1052
1052
  </entry>
1053
- <entry file="file://$USER_HOME$/.rvm/gems/ruby-2.4.1/gems/mongo-2.11.4/lib/mongo/client.rb">
1053
+ <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1054
1054
  <provider selected="true" editor-type-id="text-editor">
1055
- <state relative-caret-position="243">
1056
- <caret line="58" column="8" lean-forward="true" selection-start-line="58" selection-start-column="6" selection-end-line="58" selection-end-column="22" />
1055
+ <state relative-caret-position="346">
1056
+ <caret line="68" column="0" lean-forward="false" selection-start-line="68" selection-start-column="0" selection-end-line="69" selection-end-column="14" />
1057
1057
  <folding />
1058
1058
  </state>
1059
1059
  </provider>
1060
1060
  </entry>
1061
1061
  <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb">
1062
1062
  <provider selected="true" editor-type-id="text-editor">
1063
- <state relative-caret-position="15">
1063
+ <state relative-caret-position="427">
1064
1064
  <caret line="30" column="5" lean-forward="false" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
1065
1065
  <folding />
1066
1066
  </state>
1067
1067
  </provider>
1068
1068
  </entry>
1069
- <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
1069
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1070
1070
  <provider selected="true" editor-type-id="text-editor">
1071
- <state relative-caret-position="-242">
1072
- <caret line="38" column="9" lean-forward="true" selection-start-line="38" selection-start-column="9" selection-end-line="38" selection-end-column="9" />
1071
+ <state relative-caret-position="-127">
1072
+ <caret line="122" column="15" lean-forward="false" selection-start-line="122" selection-start-column="15" selection-end-line="122" selection-end-column="28" />
1073
1073
  <folding />
1074
1074
  </state>
1075
1075
  </provider>
1076
1076
  </entry>
1077
- <entry file="file://$PROJECT_DIR$/lib/freewifi/database/mongo/mongoconnector.rb">
1077
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1078
1078
  <provider selected="true" editor-type-id="text-editor">
1079
- <state relative-caret-position="300">
1080
- <caret line="35" column="28" lean-forward="false" selection-start-line="35" selection-start-column="28" selection-end-line="35" selection-end-column="28" />
1079
+ <state relative-caret-position="237">
1080
+ <caret line="248" column="0" lean-forward="true" selection-start-line="248" selection-start-column="0" selection-end-line="248" selection-end-column="0" />
1081
1081
  <folding />
1082
1082
  </state>
1083
1083
  </provider>
1084
1084
  </entry>
1085
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1085
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
1086
1086
  <provider selected="true" editor-type-id="text-editor">
1087
- <state relative-caret-position="421">
1088
- <caret line="73" column="2" lean-forward="false" selection-start-line="73" selection-start-column="2" selection-end-line="73" selection-end-column="2" />
1087
+ <state relative-caret-position="45">
1088
+ <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1089
1089
  <folding />
1090
1090
  </state>
1091
1091
  </provider>
1092
1092
  </entry>
1093
1093
  <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1094
1094
  <provider selected="true" editor-type-id="text-editor">
1095
- <state relative-caret-position="812">
1096
- <caret line="355" column="41" lean-forward="true" selection-start-line="355" selection-start-column="33" selection-end-line="355" selection-end-column="46" />
1095
+ <state relative-caret-position="375">
1096
+ <caret line="358" column="12" lean-forward="true" selection-start-line="358" selection-start-column="12" selection-end-line="358" selection-end-column="12" />
1097
1097
  <folding />
1098
1098
  </state>
1099
1099
  </provider>
data/lib/freewifi.rb CHANGED
@@ -353,8 +353,9 @@ class PortalFwifi_1
353
353
 
354
354
  subs_info_ret_1_thr2 = Thread.new do
355
355
  begin
356
- mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
357
- mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
356
+ p "mongo"
357
+ #mongo_connector_wifi_1 = MongoWifiCl_1.new(mongo_ip, mongo_port, mongo_database)
358
+ #mongo_connector_wifi_1.audit_logger_wifi_portal_1("wifi_get_subs_info_return_1", remote_ip, input_params, output_params, real_ip)
358
359
  rescue
359
360
  additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => {:result => "mongo failed"}, :procedure => "wifi_get_subs_info_return_1", :file => "freewifi.rb"}, "debug")
360
361
  additional_func_wifi_1.telegram_message_1("{:function => \"wifi_get_subs_info_return_1\", :result => \"failed communicate with mongo database\", :sdk => \"freewifi\"}", telegram_api_url, telegram_chat_id)
data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb CHANGED
@@ -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
@@ -1,3 +1,3 @@
1
1
  module Freewifi_1
2
- VERSION = "0.1.9"
2
+ VERSION = "0.2.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: freewifi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.9
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dzmitry Buynovskiy