freewifi 0.1.9 → 0.2.4

data/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb

@@ -0,0 +1,2 @@
+
+

data/lib/freewifi/mikrotik/newhub_mtik_api.rb

@@ -12,6 +12,7 @@ class NEWhubWifiApi_1
 
 
 def get_info_subs_from_mik_1(subs_mac, controllers_ip)
+  input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
   #region get additional information
 
   subscribers_mac = subs_mac
@@ -30,7 +31,8 @@ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
   mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
 
     req.reply.each do |reply|
-      if reply.key?('!re')
+      if reply.key?('mac-address')
+        #p reply
         if reply['mac-address'] == subscribers_mac
 
           access_point = reply['interface']
@@ -88,9 +90,7 @@ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
   end
 
   #endregion
-  answ = subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate  + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
-
-  return answ
+  subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate  + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
 
 end
 

data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb

@@ -25,7 +25,7 @@ class NEWhubWifi_1
         #result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
         #p result
         result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
-        regimsi = /\s+name=\"(.+)\"\s+/
+        regimsi = /\s+name="(.+)"\s+/
         m1 = regimsi.match(result)[1]
         sleep 0.2
         result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -42,7 +42,7 @@ class NEWhubWifi_1
     begin
       Net::SSH.start(hub2, user_hub, :password => password_hub) do |ssh|
         result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
-        regimsi = /\s+name=\"(.+)\"\s+/
+        regimsi = /\s+name="(.+)"\s+/
         m1 = regimsi.match(result)[1]
         sleep 0.2
         result2 = ssh.exec!("/interface bridge port remove [/interface bridge port find interface=#{m1}]")
@@ -222,12 +222,12 @@ class NEWhubWifi_1
           end
         end
       end
-      output_params = {:code => 200, :result => "check_pool_range_includes_1: Request processed", :body => {:result => res}}
+      output_params = {:code => 200, :result => 'check_pool_range_includes_1: Request processed', :body => {:result => res}}
     rescue
-      output_params = {:code => 507, :result => "check_pool_range_includes_1: Unknown SDK error"}
+      output_params = {:code => 507, :result => 'check_pool_range_includes_1: Unknown SDK error'}
     end
 
-    additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "check_pool_range_includes_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")
+    additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => 'check_pool_range_includes_1', :file => 'freewifi/mikrotik/newhub_mtik_ssh.rb', :sdk => 'freewifi'}, 'debug')
     output_params
   end
 
@@ -243,9 +243,9 @@ class NEWhubWifi_1
     conf_5ghz_name = "auto_cfg_5ghz_#{companyname}_#{wifissid}"
     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"
 
-    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"
+    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"
 
-    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"
+    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_5ghz_name} name-format=identity"
 
     Net::SSH.start(capsman1, capsman_user1, :password => capsman_pass1) do |ssh|
       result = ssh.exec!(command_conf_24ghz)
@@ -270,8 +270,8 @@ class NEWhubWifi_1
       result = ssh.exec!(command)
       s1 = result.split("\r\n\r\n")
       for a in s1
-        a1 = a.gsub("\r\n", "")
-        a2 = a1.gsub(",     ", ",")
+        a1 = a.gsub("\r\n", '')
+        a2 = a1.gsub(',     ', ',')
         reg_addr_range = / (\d) .+ ip-address-ranges=(\d{1,3}.+\.\d{1,3}|\d{1,3}.+\.\d{1,3}\/\d{1,2})\s+/
         m1 = a2.scan(reg_addr_range)
         num = m1[0][0]
@@ -280,7 +280,7 @@ class NEWhubWifi_1
         final_provision_old << triplet
         exists_check = self.check_pool_range_includes_1(triplet[1], ap_ip)
 
-        if exists_check[:body][:result] != "exists"
+        if exists_check[:body][:result] != 'exists'
           #self.capsman_set_ip_range_1(capsman1, capsman_user1, capsman_pass1, ap_ip)
           #set data to capsman
           rewrite_ip_command = "/caps-man provisioning set numbers=#{triplet[0]} ip-address-ranges=#{triplet[1]},#{ap_ip}"
@@ -314,7 +314,7 @@ class NEWhubWifi_1
       else
         p result
         conf_names = []
-        reg_config_name = /name=\"(\S+)\"/
+        reg_config_name = /name="(\S+)"/
         m1 = result.scan(reg_config_name)
         for a1 in m1
           if a1[0] != []
@@ -326,7 +326,7 @@ class NEWhubWifi_1
       end
     end
     rescue
-      output_params = {:code => 507, :result => "set_capsman_config_1: Unknown SDK error"}
+      output_params = {:code => 507, :result => 'set_capsman_config_1: Unknown SDK error'}
     end
 
     additional_func_wifi_1.printer_texter_wifi_1({:input_params => input_params, :output_params => output_params, :procedure => "set_capsman_config_1", :file => "freewifi/mikrotik/newhub_mtik_ssh.rb", :sdk => "freewifi"}, "debug")

data/lib/freewifi/mikrotik/schemes_conf_gen.rb

@@ -15,9 +15,9 @@ class MtikSchemesGen_1
 
     [
         "/system identity set name=#{hostname}",
-        "/interface bridge add name=bridge_tunnel",
+        '/interface bridge add name=bridge_tunnel',
         "/interface eoip add remote-address=#{hub_vip.to_s} tunnel-id=#{tunnel_id.to_s} name=tunnel_to_hub",
-        "/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel",
+        '/interface bridge port add interface=tunnel_to_hub bridge=bridge_tunnel',
         "/interface bridge port add interface=wlan1 bridge=bridge_tunnel",
         "/interface wireless set wlan1 mode=ap-bridge ssid=#{ap_ssid} disabled=no name=wireless_public_interface frequency=2442",
         "/interface ppp-client set ppp-out1 apn=vpn pin=1111 disabled=no",

data/lib/freewifi/version.rb

@@ -1,3 +1,3 @@
 module Freewifi_1
-  VERSION = "0.1.9"
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: freewifi
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.4
 platform: ruby
 authors:
 - Dzmitry Buynovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,6 +204,7 @@ files:
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
+- ".idea/runConfigurations/get_iwag_data.xml"
 - ".idea/vcs.xml"
 - ".idea/workspace.xml"
 - ".travis.yml"
@@ -218,12 +219,15 @@ files:
 - lib/freewifi.rb
 - lib/freewifi/additional/additional_functions.rb
 - lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb
+- lib/freewifi/cisco/iwag/get_iwag_data.rb
+- lib/freewifi/cisco/iwag/iwag_database_worker.rb
 - lib/freewifi/cisco/iwag/iwag_telnet_connector.rb
 - lib/freewifi/config.rb
 - lib/freewifi/database/mongo/mongoconnector.rb
 - lib/freewifi/database/mysql/database_methods_wifi.rb
 - lib/freewifi/general/wifi_portal_procedures.rb
 - lib/freewifi/huawei/hua_controller_class.rb
+- lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb
 - lib/freewifi/mikrotik/getsubscribermikrotik.rb
 - lib/freewifi/mikrotik/newhub_mtik_api.rb
 - lib/freewifi/mikrotik/newhub_mtik_ssh.rb
@@ -235,7 +239,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -250,9 +254,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.14
-signing_key: 
+signing_key:
 specification_version: 4
 summary: gem for Public WiFi
 test_files: []