bugfix: fixed utf-8 error messages

bugfix: The update script can now be run from anywhere.

scripts/check_dhcp_pool.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/dhcp-log.pl

@@ -7,9 +7,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';
@@ -21,7 +23,6 @@ use eyelib::database;
 use eyelib::common;
 use eyelib::net_utils;
 use strict;
-use warnings;
 use Getopt::Long;
 use Proc::Daemon;
 use POSIX;

scripts/eye-statd.pl

@@ -1,9 +1,11 @@
 #!/usr/bin/perl -w
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/fetch_new_arp.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/garbage.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/gen_nagios_config.pl

@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
+use strict;
 use DBI;
 use File::Basename;
 use File::Find;

scripts/hmonitor.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";

scripts/print-dnsmasq.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/restart_port_snmp.pl

@@ -4,6 +4,12 @@
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/stat-sync.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';
@@ -19,7 +21,6 @@ use eyelib::database;
 use eyelib::common;
 use eyelib::net_utils;
 use strict;
-use warnings;
 use Getopt::Long;
 use Proc::Daemon;
 use Cwd;

scripts/sync_mikrotik.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/sync_mikrotik_poe_monitor.pl

@@ -4,6 +4,12 @@
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "$Bin/";
 use strict;

scripts/syslog-stat.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/updates/db-patch-mysql-utf8.pl

@@ -5,6 +5,12 @@
 #
 
 use utf8;
+use strict;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use Data::Dumper;

scripts/updates/upgrade.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
+use strict;
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
-use open ':encoding(utf-8)';
 
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
@@ -21,7 +23,7 @@ use warnings;
 
 STDOUT->autoflush(1);
 
-my $update_dir = '/opt/Eye/scripts/updates/';
+my $update_dir = '/opt/Eye/scripts/updates';
 
 opendir(my $dh, $update_dir) or die "Eror listing for $update_dir: $!";
 my @old_releases = sort grep { -d "$update_dir/$_" && !/^\.\.?$/ && /^\d/ } readdir($dh);
@@ -64,7 +66,7 @@ my $stage = 1;
 for (my $i=$old_version_index; $i < scalar @old_releases; $i++) {
     print "Stage $stage. Upgrade to $old_releases[$i]\n";
     $stage++;
-    my $dir_name = $old_releases[$i];
+    my $dir_name = $update_dir."/".$old_releases[$i];
     $dir_name =~s/\./-/g;
     next if (! -d $dir_name);
 

scripts/utils/backupcfg.pl

@@ -5,7 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/utils/bind/print-dns-zones.pl

@@ -4,6 +4,12 @@
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/import-system-dev.pl

@@ -6,6 +6,12 @@
 
 #Обновляем БД устрйств
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "$Bin/";
 use Data::Dumper;

scripts/utils/import/import_auth.pl

@@ -5,10 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
-use open ':std', ':encoding(UTF-8)';
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";

scripts/utils/import/import_ips.pl

@@ -0,0 +1,72 @@
+#!/usr/bin/perl
+
+#
+# Copyright (C) Roman Dmitiriev, rnd@rajven.ru
+#
+
+#Import ip to user
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
+use FindBin '$Bin';
+use lib "/opt/Eye/scripts";
+use Data::Dumper;
+use eyelib::config;
+use eyelib::main;
+use eyelib::database;
+use eyelib::net_utils;
+use strict;
+use warnings;
+
+sub add_auth {
+my $db = shift;
+my $comment = shift;
+my $ip = shift;
+my $user_id = shift;
+
+my $ip_aton=StrToIp($ip);
+my $record=get_record_sql($db,'SELECT id FROM User_auth WHERE `deleted`=0 AND `ip_int`='.$ip_aton);
+if ($record->{id}) { return $record->{id}; }
+my $user_record=get_record_sql($db,"SELECT * FROM User_list WHERE id=$user_id");
+my $new_record;
+$new_record->{ip_int}=$ip_aton;
+$new_record->{ip}=$ip;
+$new_record->{user_id}=$user_id;
+$new_record->{save_traf}="$save_detail";
+$new_record->{deleted}="0";
+$new_record->{created_by}='manual';
+$new_record->{ou_id}=$user_record->{ou_id};
+$new_record->{filter_group_id}=$user_record->{filter_group_id};
+$new_record->{queue_id}=$user_record->{queue_id};
+$new_record->{enabled}="$user_record->{enabled}";
+$new_record->{comments}=$comment;
+
+my $cur_auth_id=insert_record($db,'User_auth',$new_record);
+return $cur_auth_id;
+}
+
+
+my $user_id =$ARGV[0];
+
+exit if (!$user_id);
+
+print "Stage 0: Read ip list for user_id: $user_id\n";
+
+binmode(STDOUT,':utf8');
+
+if (-e "1") {
+    my @nSQL=read_file("1");
+    foreach my $row (@nSQL) {
+        my ($user_name,$auth_ip) = split(/[\,|\;|\s]/,$row);
+        next if (!$auth_ip);
+        print "Add: $user_name $auth_ip";
+        my $ret = add_auth($dbh,$user_name,$auth_ip,$user_id);
+        if ($ret) { print "...OK\n"; } else { print "...Fail\n"; }
+        }
+    }
+print "Done!\n";
+
+exit;

scripts/utils/mac-oids/manuf.csv

@@ -4351,7 +4351,7 @@
 00:11:1B;TargaDivL3Co;Targa Systems Div L-3 Communications
 00:11:1C;PleoraTechno;Pleora Technologies Inc.
 00:11:1D;Hectrix;Hectrix Limited
-00:11:1E;ETHERNETPowe;ETHERNET Powerlink Standarization Group (EPSG)
+00:11:1E;B&RIndustria;B&R Industrial Automation GmbH
 00:11:1F;DoremiLabs;Doremi Labs, Inc.
 00:11:20;Cisco;Cisco Systems, Inc
 00:11:21;Cisco;Cisco Systems, Inc
@@ -5375,7 +5375,7 @@
 00:15:1B;Isilon;Isilon Systems Inc.
 00:15:1C;Leneco;Leneco
 00:15:1D;M2I;M2I Corporation
-00:15:1E;ETHERNETPowe;ETHERNET Powerlink Standarization Group (EPSG)
+00:15:1E;B&RIndustria;B&R Industrial Automation GmbH
 00:15:1F;MultivisionI;Multivision Intelligent Surveillance (Hong Kong) Ltd
 00:15:20;RadiocraftsA;Radiocrafts AS
 00:15:21;Horoquartz;Horoquartz
@@ -8621,7 +8621,7 @@
 00:21:01;Aplicaciones;Aplicaciones Electronicas Quasar (AEQ)
 00:21:02;UpdateLogic;UpdateLogic Inc.
 00:21:03;GHIElectroni;GHI Electronics, LLC
-00:21:04;GigasetCommu;Gigaset Communications GmbH
+00:21:04;GigasetTechn;Gigaset Technologies GmbH
 00:21:05;AlcatelLucen;Alcatel-Lucent IPD
 00:21:06;RIMTestingSe;RIM Testing Services
 00:21:07;Seowonintech;Seowonintech Co Ltd.
@@ -16349,6 +16349,7 @@
 00:A2:EE;Cisco;Cisco Systems, Inc
 00:A2:F5;GuangzhouYua;Guangzhou Yuanyun Network Technology Co.,Ltd
 00:A2:FF;abatecgroup;abatec group AG
+00:A3:07;HonorDevice;Honor Device Co., Ltd.
 00:A3:88;SkyUk;Sky Uk Limited
 00:A3:8E;Cisco;Cisco Systems, Inc
 00:A3:D1;Cisco;Cisco Systems, Inc
@@ -17567,6 +17568,7 @@
 04:62:D7;AlstomHydroF;Alstom Hydro France
 04:63:D0;HuaweiDevice;Huawei Device Co., Ltd.
 04:63:E0;Nome;Nome Oy
+04:64:FA;Dell;Dell Inc.
 04:65:65;Testop;Testop
 04:67:61;XiaomiMobile;Beijing Xiaomi Mobile Software Co., Ltd
 04:67:85;scemtecHardu;scemtec Hard- und Software fuer Mess- und Steuerungstechnik GmbH
@@ -21237,6 +21239,7 @@
 20:47:ED;SkyUk;Sky Uk Limited
 20:4A:AA;HanscanSpain;Hanscan Spain S.A.
 20:4B:22;SunnovoInter;Sunnovo International Limited
+20:4B:2E;PizzatoElett;Pizzato Elettrica S.r.l.
 20:4C:03;HewlettPacka;Hewlett Packard Enterprise
 20:4C:6D;HugoBrennens;Hugo Brennenstuhl Gmbh & Co. KG.
 20:4C:9E;Cisco;Cisco Systems, Inc
@@ -21366,6 +21369,7 @@
 20:9A:7D;SagemcomBroa;Sagemcom Broadband SAS
 20:9A:E9;Volacomm;Volacomm Co., Ltd
 20:9B:A5;JIAXINGGLEAD;JIAXING GLEAD Electronics Co.,Ltd
+20:9B:A9;Espressif;Espressif Inc.
 20:9B:CD;Apple;Apple, Inc.
 20:9B:DD;HuaweiTechno;Huawei Technologies Co.,Ltd
 20:9B:E6;GuangzhouShi;Guangzhou Shiyuan Electronic Technology Company Limited
@@ -22311,6 +22315,7 @@
 28:AC:9E;Cisco;Cisco Systems, Inc
 28:AD:18;HuiZhouGaosh;Hui Zhou Gaoshengda Technology Co.,LTD
 28:AD:3E;TONGBOWEITec;Shenzhen TONG BO WEI Technology CO.,LTD
+28:AD:EA;MallowSAS;Mallow SAS
 28:AF:0A;SiriusXMRadi;Sirius XM Radio Inc
 28:AF:21;zte;zte corporation
 28:AF:42;SamsungElect;Samsung Electronics Co.,Ltd
@@ -22831,6 +22836,7 @@
 2C:78:0E;HuaweiDevice;Huawei Device Co., Ltd.
 2C:78:4C;ItonTechnolo;Iton Technology Corp.
 2C:79:3D;BoditechMed;Boditech Med
+2C:79:BE;TpLinkTechno;Tp-Link Technologies Co.,Ltd.
 2C:79:D7;SagemcomBroa;Sagemcom Broadband SAS
 2C:7A:F4:00;Annapurnalab;Annapurna labs
 2C:7A:F4:10;Annapurnalab;Annapurna labs
@@ -26296,6 +26302,7 @@
 44:65:8A;Dukelana;Dukelana LLC
 44:65:E0;MerlionConsu;Merlion Consulting Services (Shenzhen) Co., Ltd
 44:66:6E;IpLine;Ip-Line
+44:66:90;TpLinkTechno;Tp-Link Technologies Co.,Ltd.
 44:66:FC;OppoMobileTe;Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 44:67:47;HuaweiTechno;Huawei Technologies Co.,Ltd
 44:67:52;WistronINFOC;Wistron INFOCOMM (Zhongshan) CORPORATION
@@ -27099,6 +27106,7 @@
 4C:06:8A;BaslerElectr;Basler Electric Company
 4C:06:B7;ProDVXEurope;ProDVX Europe B.V.
 4C:07:C9;COMPUTEROFFI;COMPUTER OFFICE Co.,Ltd.
+4C:09:97;AristaNetwor;Arista Networks
 4C:09:B4;zte;zte corporation
 4C:09:D4;ArcadyanTech;Arcadyan Technology Corporation
 4C:09:FA;FrontierSmar;Frontier Smart Technologies Ltd
@@ -28202,6 +28210,7 @@
 54:1D:FB;FreestyleEne;Freestyle Energy Ltd
 54:1E:56;JuniperNetwo;Juniper Networks
 54:1F:8D;zte;zte corporation
+54:1F:CD;OppoMobileTe;Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 54:1F:D5;AdvantageEle;Advantage Electronics
 54:20:18;TelyLabs;Tely Labs
 54:20:97;TTTechAuto;TTTech Auto AG
@@ -28885,7 +28894,7 @@
 58:9B:4A;DWnetTechnol;DWnet Technologies(Suzhou) Corporation
 58:9B:F7;HefeiRadioCo;Hefei Radio Communication Technology Co., Ltd
 58:9C:FC;FreeBSDFound;FreeBSD Foundation
-58:9E:C6;GigasetCommu;Gigaset Communications GmbH
+58:9E:C6;GigasetTechn;Gigaset Technologies GmbH
 58:A0:23;Intel;Intel Corporate
 58:A0:CB;TrackNet;TrackNet, Inc
 58:A1:5F;TexasInstrum;Texas Instruments
@@ -29683,6 +29692,7 @@
 60:22:32;Ubiquiti;Ubiquiti Inc
 60:23:A4;SichuanAILin;Sichuan AI-Link Technology Co., Ltd.
 60:24:C1;JiangsuZhong;Jiangsu Zhongxun Electronic Technology Co., Ltd
+60:25:ED;HewlettPacka;Hewlett Packard Enterprise
 60:26:02;TexasInstrum;Texas Instruments
 60:26:AA;Cisco;Cisco Systems, Inc
 60:26:EF;HewlettPacka;Hewlett Packard Enterprise
@@ -29737,6 +29747,7 @@
 60:45:CD;SagemcomBroa;Sagemcom Broadband SAS
 60:45:E8;Arcadyan;Arcadyan Corporation
 60:46:16;XiamenVannIn;Xiamen Vann Intelligent Co., Ltd
+60:47:0A;ZenithIntell;Shenzhen Zenith Intelligent Technology Co., Ltd.
 60:47:62;SensoroTechn;Beijing Sensoro Technology Co.,Ltd.
 60:47:D4;FORICSElectr;FORICS Electronic Technology Co., Ltd.
 60:48:26;NewbridgeTec;Newbridge Technologies Int. Ltd.
@@ -29782,6 +29793,7 @@
 60:64:53;AOD;AOD Co.,Ltd.
 60:64:A1;RADiflow;RADiflow Ltd.
 60:65:25;Apple;Apple, Inc.
+60:65:F4;ChipseaTechn;Chipsea Technologies (Shenzhen) Crop.
 60:66:82;AtekoPhotoel;Shenzhen Ateko Photoelectricity Co.,Ltd
 60:67:20;Intel;Intel Corporate
 60:68:32;SeneasyIntel;Guangdong Seneasy Intelligent Technology Co., Ltd.
@@ -29875,6 +29887,7 @@
 60:95:CE:C0;Synamedia;Synamedia
 60:95:CE:D0;GovComm;GovComm
 60:95:CE:E0;VNS;VNS Inc.
+60:95:F8;Arcadyan;Arcadyan Corporation
 60:96:20;Private;Private
 60:96:A4;HuaweiTechno;Huawei Technologies Co.,Ltd
 60:97:DD;MicroSysElec;MicroSys Electronics GmbH
@@ -30159,6 +30172,7 @@
 64:2F:1C;HuaweiTechno;Huawei Technologies Co.,Ltd
 64:2F:C7;NewH3CTechno;New H3C Technologies Co., Ltd
 64:31:35;Apple;Apple, Inc.
+64:31:36;MellanoxTech;Mellanox Technologies, Inc.
 64:31:39:00;EmeetIntelli;Shenzhen Emeet Intelligent Technology Co., Ltd.
 64:31:39:10;LivongoHealt;Livongo Health
 64:31:39:20;Smartplus;Smartplus Inc.
@@ -31733,6 +31747,7 @@
 70:76:FF;Kerlink;Kerlink
 70:77:81;HonHaiPrecis;Hon Hai Precision Ind. Co.,Ltd.
 70:78:8B;vivoMobileCo;vivo Mobile Communication Co., Ltd.
+70:79:2D;MellanoxTech;Mellanox Technologies, Inc.
 70:79:38;WuxiZhanruiE;Wuxi Zhanrui Electronic Technology Co.,LTD
 70:79:90;HuaweiTechno;Huawei Technologies Co.,Ltd
 70:79:B3;Cisco;Cisco Systems, Inc
@@ -37809,6 +37824,7 @@
 80:28:3C;Sonova;Sonova AG
 80:29:94;VantivaUSA;Vantiva USA LLC
 80:2A:A8;Ubiquiti;Ubiquiti Inc
+80:2A:F6;HonorDevice;Honor Device Co., Ltd.
 80:2A:FA;Germaneers;Germaneers GmbH
 80:2B:F9;HonHaiPrecis;Hon Hai Precision Ind. Co.,Ltd.
 80:2D:1A;zte;zte corporation
@@ -37935,10 +37951,19 @@
 80:76:77;puwellcloudt;hangzhou puwell cloud tech co., ltd.
 80:76:93;Newag;Newag SA
 80:76:C2;GDMideaAirCo;GD Midea Air-Conditioning Equipment Co.,Ltd.
+80:77:86:00;DaisyAudio;Daisy Audio Inc.
 80:77:86:10;Raycon;Raycon
 80:77:86:20;Wintec;Wintec Co., Ltd
 80:77:86:30;Demeas;Demeas
 80:77:86:40;RealtimeBiom;Realtime Biometrics India (P) limited
+80:77:86:50;AdianceTechn;Adiance Technologies Pvt Ltd
+80:77:86:70;PartronicseB;Partronics eBoards Pvt Ltd
+80:77:86:80;YSTenTechnol;YSTen Technology Co., Ltd.
+80:77:86:90;SMWAutoblokS;SMW-Autoblok Spannsysteme
+80:77:86:A0;HuizhouJieme;Huizhou Jiemeisi Technology Co.,Ltd.
+80:77:86:B0;Mach;Mach
+80:77:86:C0;CornerstoneT;Cornerstone Technology (Shenzhen) Limited
+80:77:86:D0;AppliedEnerg;Applied Energy Technologies Pvt Ltd
 80:77:A4;TecnoMobile;Tecno Mobile Limited
 80:78:71;AskeyCompute;Askey Computer Corp
 80:79:33;AigentecTech;Aigentec Technology(Zhejiang) Co., Ltd.
@@ -38548,6 +38573,7 @@
 84:B6:30;SichuanTiany;Sichuan Tianyi Comheart Telecom Co.,LTD
 84:B8:02;Cisco;Cisco Systems, Inc
 84:B8:66;XiaoLutechno;Beijing XiaoLu technology co. LTD
+84:B8:90;TpLinkTechno;Tp-Link Technologies Co.,Ltd.
 84:B8:B8;MotorolaMobi;Motorola (Wuhan) Mobility Technologies Communication Co., Ltd.
 84:BA:20;SiliconLabor;Silicon Laboratories
 84:BA:3B;Canon;Canon Inc.
@@ -38965,6 +38991,7 @@
 88:97:65;exands;exands
 88:97:DF;EntrypassSdn;Entrypass Corporation Sdn. Bhd.
 88:98:21;Teraon;Teraon
+88:99:86;TpLinkTechno;Tp-Link Technologies Co.,Ltd.
 88:9A:FF;SystemX;SystemX Co.,Ltd.
 88:9B:39;SamsungElect;Samsung Electronics Co.,Ltd
 88:9C:A6;BTBKorea;BTB Korea INC
@@ -39147,6 +39174,7 @@
 88:F0:0F;Miraeil;Miraeil
 88:F0:31;Cisco;Cisco Systems, Inc
 88:F0:77;Cisco;Cisco Systems, Inc
+88:F1:55;Espressif;Espressif Inc.
 88:F2:BD;GDMideaAirCo;GD Midea Air-Conditioning Equipment Co.,Ltd.
 88:F4:88;celloncommun;cellon communications technology(shenzhen)Co.,Ltd.
 88:F4:90;JetmobilePte;Jetmobile Pte Ltd
@@ -39318,6 +39346,7 @@
 8C:1F:64:04:90;NuancesOrg;Nuances Org
 8C:1F:64:04:A0;GSElektromed;GS Elektromedizinsiche Geräte G. Stemple GmbH
 8C:1F:64:04:C0;GamberJohnso;Gamber-Johnson LLC
+8C:1F:64:04:D0;LaserLinc;LaserLinc, Inc.
 8C:1F:64:04:E0;Auditdata;Auditdata
 8C:1F:64:04:F0;ISILINE;ISILINE srl
 8C:1F:64:05:10;CPcontechele;CP contech electronic GmbH
@@ -39467,6 +39496,7 @@
 8C:1F:64:12:D0;YUYAMAMFG;YUYAMA MFG Co.,Ltd
 8C:1F:64:12:E0;inomatic;inomatic GmbH
 8C:1F:64:13:30;Vtron;Vtron Pty Ltd
+8C:1F:64:13:40;LyconSys;LyconSys GmbH & Co.KG
 8C:1F:64:13:50;YuvalFichman;Yuval Fichman
 8C:1F:64:13:80;Vissavisp;Vissavi sp. z o.o.
 8C:1F:64:13:B0;SDELcc;SDELcc
@@ -39475,6 +39505,7 @@
 8C:1F:64:13:F0;Elsist;Elsist Srl
 8C:1F:64:14:00;RFTuote;RF-Tuote Oy
 8C:1F:64:14:10;CodeBlue;Code Blue Corporation
+8C:1F:64:14:30;ChamSys;ChamSys
 8C:1F:64:14:40;LangfangENNl;Langfang ENN lntelligent Technology Co.,Ltd.
 8C:1F:64:14:50;SpectrumFift;Spectrum FiftyNine BV
 8C:1F:64:14:60;ZhongrunXinc;Zhongrun Xinchan (Beijing) Technology Co., Ltd
@@ -39633,6 +39664,7 @@
 8C:1F:64:25:40;ZhuhaiYunzho;Zhuhai Yunzhou Intelligence Technology Ltd.
 8C:1F:64:25:60;Landinger;Landinger
 8C:1F:64:25:70;FourBarsDesi;Four Bars Design
+8C:1F:64:25:90;SHODEN;SHODEN Co., Ltd.
 8C:1F:64:25:A0;XingtuxinkeE;Wuhan Xingtuxinke ELectronic Co.,Ltd
 8C:1F:64:25:C0;TimeMachines;TimeMachines Inc.
 8C:1F:64:25:E0;R2Sonic;R2Sonic, LLC
@@ -39695,6 +39727,7 @@
 8C:1F:64:2A:70;aelettronica;aelettronica group srl
 8C:1F:64:2A:80;SHALARMSECUR;SHALARM SECURITY Co.,LTD
 8C:1F:64:2A:90;ElbitAmerica;Elbit Systems of America, LLC
+8C:1F:64:2A:A0;XianSingular;Xi'an Singularity Energy Co., Ltd.
 8C:1F:64:2A:C0;Dco;Dco Systems Ltd
 8C:1F:64:2A:F0;ABestLid;A-Best Co.,Lid.
 8C:1F:64:2B:10;UMeiDahIntLE;U -Mei-Dah Int'L Enterprise Co.,Ltd.
@@ -39875,6 +39908,7 @@
 8C:1F:64:3C:70;Resmed;Resmed Pty Ltd
 8C:1F:64:3C:80;BTGInstrumen;BTG Instruments AB
 8C:1F:64:3C:90;TECHPLUSLINK;TECHPLUS-LINK Technology Co.,Ltd
+8C:1F:64:3C:B0;AnhuiWenxian;Anhui Wenxiang Technology Co.,Ltd.
 8C:1F:64:3C:D0;Sejongsecuri;Sejong security system Cor.
 8C:1F:64:3C:E0;MahindrMahin;Mahindr & Mahindra
 8C:1F:64:3D:00;Tripltek;Tripltek
@@ -40236,6 +40270,7 @@
 8C:1F:64:60:80;CongTyPhanKy;Cong Ty Co Phan Ky Thuat Moi Truong Viet An
 8C:1F:64:60:A0;Rfengine;Rfengine Co., Ltd.
 8C:1F:64:60:B0;eumigindustr;eumig industrie-TV GmbH.
+8C:1F:64:60:C0;PAL;PAL Inc.
 8C:1F:64:60:E0;ICTInternati;ICT International
 8C:1F:64:60:F0;Sael;Sael Srl
 8C:1F:64:61:00;ZhongzhiHuid;Beijing Zhongzhi Huida Technology Co., Ltd
@@ -40290,6 +40325,7 @@
 8C:1F:64:66:20;SuzhouLeamor;Suzhou Leamore Optronics Co., Ltd.
 8C:1F:64:66:30;maltechTechn;mal-tech Technological Solutions Ltd/CRISP
 8C:1F:64:66:40;Thermoeye;Thermoeye Inc
+8C:1F:64:66:B0;CurruxVision;Currux Vision LLC
 8C:1F:64:66:C0;LineagePower;Lineage Power Pvt Ltd.,
 8C:1F:64:66:D0;Vt100;Vt100 Srl
 8C:1F:64:66:E0;Monnit;Monnit Corporation
@@ -41032,6 +41068,7 @@
 8C:1F:64:B0:30;PisoftwareTe;Shenzhen Pisoftware Technology Co.,Ltd.
 8C:1F:64:B0:80;CronusElectr;Cronus Electronics
 8C:1F:64:B0:C0;BarkodesBilg;Barkodes Bilgisayar Sistemleri Bilgi Iletisim ve Y
+8C:1F:64:B0:E0;WatthourEngi;Watthour Engineering Co., Inc.
 8C:1F:64:B0:F0;HKCSecurity;HKC Security Ltd.
 8C:1F:64:B1:00;MTUAeroEngin;MTU Aero Engines AG
 8C:1F:64:B1:30;Abode;Abode Systems Inc
@@ -43002,6 +43039,7 @@
 94:66:E7;WOMEngineeri;WOM Engineering
 94:67:7E;BeldenIndiaP;Belden India Private Limited
 94:6A:77;VantivaUSA;Vantiva USA LLC
+94:6A:7C;OnePlusTechn;OnePlus Technology (Shenzhen) Co., Ltd
 94:6A:B0;Arcadyan;Arcadyan Corporation
 94:6C:04;EMMicroelect;EM Microelectronic
 94:6D:AE;MellanoxTech;Mellanox Technologies, Inc.
@@ -43290,6 +43328,7 @@
 94:FB:A7:D0;RosenbergerT;Rosenberger Technologies Co.,Ltd.
 94:FB:A7:E0;SkyringSmart;Skyring Smart Technologies(Shenzhen) Co., Ltd.
 94:FB:B2;GongjinElect;Shenzhen Gongjin Electronics Co.,Lt
+94:FC:87;HirschmannAu;Hirschmann Automation and Control GmbH
 94:FD:1D;WhereWhen;WhereWhen Corp
 94:FD:2E;UniscopeTech;Shanghai Uniscope Technologies Co.,Ltd
 94:FE:22;HuaweiTechno;Huawei Technologies Co.,Ltd
@@ -44964,6 +45003,7 @@ A4:3F:A7;HewlettPacka;Hewlett Packard Enterprise
 A4:40:27;zte;zte corporation
 A4:40:3D;BaseusTechno;Shenzhen Baseus Technology Co., Ltd.
 A4:42:3B;Intel;Intel Corporate
+A4:43:1B;DreamtekInte;Dreamtek Intelligent Technology Co., Ltd
 A4:43:43;HuaweiDevice;Huawei Device Co., Ltd.
 A4:43:80;HuaweiDevice;Huawei Device Co., Ltd.
 A4:43:8C;Commscope;Commscope
@@ -45856,6 +45896,7 @@ AC:22:0B;ASUSTekCOMPU;ASUSTek COMPUTER INC.
 AC:23:16;Mist;Mist Systems, Inc.
 AC:23:34;Infinixmobil;Infinix mobility limited
 AC:23:3F;MinewTechnol;Shenzhen Minew Technologies Co., Ltd.
+AC:27:6E;Espressif;Espressif Inc.
 AC:29:29;Infinixmobil;Infinix mobility limited
 AC:29:3A;Apple;Apple, Inc.
 AC:2A:0C;CsrZhuzhouIn;Csr Zhuzhou Institute Co.,Ltd.
@@ -46170,6 +46211,7 @@ AC:CF:85;HuaweiTechno;Huawei Technologies Co.,Ltd
 AC:D0:74;Espressif;Espressif Inc.
 AC:D1:80;CrexendoBusi;Crexendo Business Solutions, Inc.
 AC:D1:B8;HonHaiPrecis;Hon Hai Precision Ind. Co.,Ltd.
+AC:D2:0C;SingCoreTech;Chengdu SingCore Technology Co.,Ltd.
 AC:D3:1D;CiscoMeraki;Cisco Meraki
 AC:D3:64;AbbAbbSaceDi;Abb Spa, Abb Sace Div.
 AC:D3:FB;ArycsTechnol;Arycs Technologies Inc
@@ -47270,6 +47312,7 @@ B8:2F:CB;CMSElectraco;CMS Electracom
 B8:30:A8;RoadTrackTel;Road-Track Telematics Development
 B8:31:B5;Microsoft;Microsoft Corporation
 B8:32:41;TianyuInform;Wuhan Tianyu Information Industry Co., Ltd.
+B8:32:8F;eero;eero inc.
 B8:36:D8;Videoswitch;Videoswitch
 B8:37:4A;Apple;Apple, Inc.
 B8:37:4B;HewlettPacka;Hewlett Packard Enterprise
@@ -47358,6 +47401,7 @@ B8:60:61;ChinaMobileG;China Mobile Group Device Co.,Ltd.
 B8:60:91;OnnetTechnol;Onnet Technologies and Innovations LLC
 B8:61:42;TricolorTech;Beijing Tricolor Technology Co., Ltd
 B8:61:6F;AcctonTechno;Accton Technology Corp
+B8:61:FC;JuniperNetwo;Juniper Networks
 B8:62:1F;Cisco;Cisco Systems, Inc
 B8:63:4D;Apple;Apple, Inc.
 B8:63:92;GeniusTechno;Guangdong Genius Technology Co., Ltd.
@@ -47400,6 +47444,7 @@ B8:81:98;Intel;Intel Corporate
 B8:81:FA;Apple;Apple, Inc.
 B8:82:F2;WNC;WNC Corporation
 B8:83:03;HewlettPacka;Hewlett Packard Enterprise
+B8:84:11;Shokz;Shenzhen Shokz Co., Ltd.
 B8:85:7B;HuaweiTechno;Huawei Technologies Co.,Ltd
 B8:85:84;Dell;Dell Inc.
 B8:86:87;LiteonTechno;Liteon Technology Corporation
@@ -52837,6 +52882,7 @@ E4:77:27;HuaweiTechno;Huawei Technologies Co.,Ltd
 E4:77:6B;Aartesys;Aartesys Ag
 E4:77:D4;MinrrayIndus;Minrray Industry Co.,Ltd
 E4:78:76;AristaNetwor;Arista Networks
+E4:79:3F;JuniperNetwo;Juniper Networks
 E4:7A:2C;SzDjiTechnol;Sz Dji Technology Co.,Ltd
 E4:7B:3F;CloudTechnol;Beijing Co-Cloud Technology Ltd.
 E4:7C:1A;mercurycorpe;mercury corperation
@@ -53164,6 +53210,7 @@ E8:45:8B;MitraStarTec;MitraStar Technology Corp.
 E8:45:EB;KohlerVentur;Kohler Ventures, Inc.
 E8:47:27;QuectelWirel;Quectel Wireless Solutions Co.,Ltd.
 E8:47:3A;HonHaiPrecis;Hon Hai Precision Industry Co.,LTD
+E8:47:F3;upscaleai;upscale ai
 E8:48:1F;AdvancedAuto;Advanced Automotive Antennas
 E8:48:B8;TPLink;TP-Link Systems Inc
 E8:49:43;YUGEInformat;YUGE Information technology Co. Ltd
@@ -54212,6 +54259,7 @@ F0:4D:A2;Dell;Dell Inc.
 F0:4D:D4;SagemcomBroa;Sagemcom Broadband SAS
 F0:4E:A4;HP;HP Inc.
 F0:4F:7C;AmazonTechno;Amazon Technologies Inc.
+F0:4F:E0;Vizio;Vizio, Inc
 F0:51:36;TCTmobile;TCT mobile ltd
 F0:51:EA;Fitbit;Fitbit, Inc.
 F0:54:94;HoneywellCon;Honeywell Connected Building
@@ -55067,6 +55115,7 @@ F8:0B:BE;Commscope;Commscope
 F8:0B:CB;Cisco;Cisco Systems, Inc
 F8:0B:D0;DatangTeleco;Datang Telecom communication terminal (Tianjin) Co., Ltd.
 F8:0C:58;TaicangT&WEl;Taicang T&W Electronics
+F8:0C:9A;OppoMobileTe;Guangdong Oppo Mobile Telecommunications Corp.,Ltd
 F8:0C:F3;LGElectronic;LG Electronics (Mobile Communications)
 F8:0D:43;HonHaiPrecis;Hon Hai Precision Ind. Co.,Ltd.
 F8:0D:4B;Nextracker;Nextracker, Inc.

scripts/utils/mac-oids/update-mac-vendors.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
-use Encode qw(encode decode);
-use open ':std', ':encoding(utf8)';
+
 use English;
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";

scripts/utils/oxidized/add_source_input_port.patch

@@ -0,0 +1,68 @@
+diff -urN oxidized/lib/oxidized/input/ssh.rb oxidized.patched/lib/oxidized/input/ssh.rb
+--- oxidized/lib/oxidized/input/ssh.rb	2023-06-25 13:21:13.549859510 +0300
++++ oxidized.patched/lib/oxidized/input/ssh.rb	2023-06-26 01:05:44.715259384 +0300
+@@ -121,6 +121,7 @@
+ 
+     def make_ssh_opts
+       secure = Oxidized.config.input.ssh.secure?
++      node_ssh_port = @node.input_port || vars(:ssh_port)
+       ssh_opts = {
+         number_of_password_prompts:      0,
+         keepalive:                       vars(:ssh_no_keepalive) ? false : true,
+@@ -128,7 +129,7 @@
+         append_all_supported_algorithms: true,
+         password:                        @node.auth[:password],
+         timeout:                         Oxidized.config.timeout,
+-        port:                            (vars(:ssh_port) || 22).to_i,
++        port:                            (node_ssh_port || 22).to_i,
+         forward_agent:                   false
+       }
+ 
+diff -urN oxidized/lib/oxidized/input/telnet.rb oxidized.patched/lib/oxidized/input/telnet.rb
+--- oxidized/lib/oxidized/input/telnet.rb	2023-06-25 13:21:13.549859510 +0300
++++ oxidized.patched/lib/oxidized/input/telnet.rb	2023-06-26 01:05:51.839271280 +0300
+@@ -11,11 +11,11 @@
+       @timeout = Oxidized.config.timeout
+       @node.model.cfg['telnet'].each { |cb| instance_exec(&cb) }
+       @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-telnet", 'w') if Oxidized.config.input.debug?
+-      port = vars(:telnet_port) || 23
++      port = @node.input_port || vars(:telnet_port)
+ 
+       telnet_opts = {
+         'Host'    => @node.ip,
+-        'Port'    => port.to_i,
++        'Port'    => (port || 23).to_i,
+         'Timeout' => @timeout,
+         'Model'   => @node.model,
+         'Log'     => @log
+diff -urN oxidized/lib/oxidized/node.rb oxidized.patched/lib/oxidized/node.rb
+--- oxidized/lib/oxidized/node.rb	2023-06-25 13:21:13.557859532 +0300
++++ oxidized.patched/lib/oxidized/node.rb	2023-06-26 01:25:50.009837507 +0300
+@@ -6,7 +6,7 @@
+   class ModelNotFound  < OxidizedError; end
+ 
+   class Node
+-    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo
++    attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo, :input_port
+     attr_accessor :running, :user, :email, :msg, :from, :stats, :retry, :err_type, :err_reason
+     alias running? running
+ 
+@@ -26,6 +26,7 @@
+       @auth = resolve_auth opt
+       @prompt = resolve_prompt opt
+       @vars = opt[:vars]
++      @input_port = resolve_input_port opt
+       @stats = Stats.new
+       @retry = 0
+       @repo = resolve_repo opt
+@@ -165,6 +166,10 @@
+       end
+     end
+ 
++    def resolve_input_port(opt)
++      resolve_key :input_port, opt
++    end
++
+     def resolve_output(opt)
+       output = resolve_key :output, opt, Oxidized.config.output.default
+       Oxidized.mgr.add_output(output) || raise(MethodNotFound, "#{output} not found for node #{ip}") unless Oxidized.mgr.output[output]

scripts/utils/oxidized/print_devices_oxi.pl

@@ -5,6 +5,11 @@
 #
 
 use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/parse_flow.pl

@@ -5,7 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/utils/print-ou-ip.pl

@@ -4,6 +4,12 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/print_cacti_create.pl

@@ -2,6 +2,13 @@
 #
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
+
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;
@@ -10,7 +17,6 @@ use Date::Parse;
 use eyelib::config;
 use eyelib::database;
 use eyelib::common;
-use utf8;
 
 
 ##### unknown mac clean ############

scripts/utils/print_cacti_hosts.pl

@@ -2,6 +2,11 @@
 #
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
 
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
@@ -11,7 +16,6 @@ use Date::Parse;
 use eyelib::config;
 use eyelib::database;
 use eyelib::common;
-use utf8;
 
 ##### unknown mac clean ############
 

scripts/utils/print_devices.pl

@@ -3,7 +3,11 @@
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/radius/print_huntgroups.pl

@@ -2,8 +2,13 @@
 #
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
+
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/reaply_rules.pl

@@ -7,7 +7,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/utils/scan_ipcam.pl

@@ -1,7 +1,11 @@
 #!/usr/bin/perl 
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use DBI;

scripts/utils/set_dns_record.pl

@@ -5,7 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/utils/set_port_descr.pl

@@ -5,9 +5,11 @@
 #
 
 use utf8;
-use open ":encoding(utf8)";
+use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use base;
 use FindBin '$Bin';

scripts/utils/sync_ccd.pl

@@ -1,9 +1,11 @@
 #!/usr/bin/perl 
 
-use strict;
+use utf8;
 use warnings;
 use Encode;
+use open qw(:std :encoding(UTF-8));
 no warnings 'utf8';
+
 use English;
 use LWP::UserAgent;
 use JSON;

scripts/utils/trap_restart.pl

@@ -3,6 +3,11 @@
 #
 # Copyright (C) Roman Dmitiriev, rnd@rajven.ru
 #
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
 
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";

scripts/utils/win32/print-dhcpd-netsh.pl

@@ -3,6 +3,13 @@
 #
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
+
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;

scripts/utils/win32/sync-dhcpd-netsh.pl

@@ -4,6 +4,12 @@
 # Copyright (C) Roman Dmitriev, rnd@rajven.ru
 #
 
+use utf8;
+use warnings;
+use Encode;
+use open qw(:std :encoding(UTF-8));
+no warnings 'utf8';
+
 use FindBin '$Bin';
 use lib "/opt/Eye/scripts";
 use strict;