VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-20 16:48:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add config option to show HW vendor in lease list

Browse Source
This commit is contained in:
Jamie Cameron
2020-11-21 12:47:36 -08:00
parent 6d9d8dbe6a
commit 823ea74ca1
59 changed files with 23135 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dhcpd/config-Amazon-Linux-2-ALL
View File

@ -13,3 +13,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-CentOS-Linux-5
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-CentOS-Linux-6.0-6.9
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-CentOS-Linux-7.0-ALL
View File

@ -13,3 +13,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-Redhat-Enterprise-Linux-6.0-6.9
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-Redhat-Enterprise-Linux-7.0-ALL
View File

@ -13,3 +13,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-Scientific-Linux-6.0-6.9
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-Scientific-Linux-7.0-ALL
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-Ubuntu-Linux-12.04-ALL
View File

@ -14,3 +14,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=debian
lease_vendor=0

1
dhcpd/config-Ubuntu-Linux-8.10-10.04.4
View File

@ -14,3 +14,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=debian
lease_vendor=0

1
dhcpd/config-cobalt-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-coherent-linux
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-corel-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-debian-linux
View File

@ -13,3 +13,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-debian-linux-3.0
View File

@ -14,3 +14,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=debian
lease_vendor=0

1
dhcpd/config-debian-linux-3.1-5.9
View File

@ -14,3 +14,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=debian
lease_vendor=0

1
dhcpd/config-debian-linux-6.0-ALL
View File

@ -14,3 +14,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=debian
lease_vendor=0

1
dhcpd/config-freebsd
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-freebsd-8-ALL
View File

@ -14,3 +14,4 @@ interfaces_type=freebsd
start_cmd=/usr/local/etc/rc.d/isc-dhcpd forcestart
stop_cmd=/usr/local/etc/rc.d/isc-dhcpd forcestop
restart_cmd=/usr/local/etc/rc.d/isc-dhcpd onerestart
lease_vendor=0

1
dhcpd/config-generic-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-gentoo-linux
View File

@ -13,3 +13,4 @@ group_name=0
display_max=100
desc_name=0
interfaces_type=gentoo
lease_vendor=0

1
dhcpd/config-hpux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-irix
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-macos
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-mandrake-linux
View File

@ -12,3 +12,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-msc-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-netbsd
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-open-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-open-linux-3.1e
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-openbsd
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-openbsd-3.6-ALL
View File

@ -10,3 +10,4 @@ group_name=0
display_max=100
desc_name=0
version=3
lease_vendor=0

1
dhcpd/config-openmamba-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-openserver
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-osf1
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-pardus-linux
View File

@ -13,3 +13,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux-13.1-19.0
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux-20.0-23.0
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux-24.0-ALL
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux-6.0-6.2
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-redhat-linux-7.0-13.0
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-slackware-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-slackware-linux-4.0
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-slackware-linux-7.1-ALL
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-sol-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-solaris
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-suse-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-suse-linux-7.1-7.3
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-suse-linux-8.0
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-suse-linux-8.2-9.1
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-suse-linux-9.2-ALL
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-trustix-linux
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-turbo-linux
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-united-linux
View File

@ -14,3 +14,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config-unixware
View File

@ -10,3 +10,4 @@ show_mac=0
group_name=0
display_max=100
desc_name=0
lease_vendor=0

1
dhcpd/config.info
View File

@ -3,6 +3,7 @@ lease_sort=Sort leases by,1,0-Order in file,1-IP address,2-Hostname
hostnet_list=Display subnets and hosts as,1,0-Icons,1-List
dhcpd_nocols=Icons in row,0,5
lease_tz=Display leases times in,1,0-GMT,1-Local time
lease_vendor=Show vendors in list of leases?,1,1-Yes,0-No
lease_refresh=Seconds between refreshing lease list,3,Never
show_ip=Show IP addresses for hosts?,1,1-Yes,0-No
show_mac=Show MAC addresses for hosts?,1,1-Yes,0-No

18
dhcpd/dhcpd-lib.pl
View File

@ -1017,4 +1017,22 @@ foreach my $f (reverse(&get_all_config_files())) {
}
}
sub lookup_mac_vendor
{
my ($mac) = @_;
if (!%mac_vendor_cache) {
%mac_vendor_cache = ();
my $lref = &read_file_lines(
$module_root_directory."/mac-vendor.txt", 1);
foreach my $l (@$lref) {
$l =~ s/#.*$//;
my ($pfx, $vendor, $desc) = split(/\t+/, $l);
$mac_vendor_cache{$pfx} = $vendor;
}
}
$mac =~ s/://g;
$mac = uc($mac);
return $mac_vendor_cache{substr($mac, 0, 6)};
}
1;

6
dhcpd/list_leases.cgi
View File

@ -195,6 +195,7 @@ else {
"",
&sort_link("ipaddr"),
&sort_link("ether"),
$config{'lease_vendor'} ? ( &sort_link("vendor") ) : (),
&sort_link("host"),
&sort_link("start"),
&sort_link("end"),
@ -212,6 +213,11 @@ else {
push(@cols,$hard->{'values'}->[1] ?
"<tt>$hard->{'values'}->[1]</tt>" :
"<i>$text{'listl_unknown'}</i>");
if ($config{'lease_vendor'}) {
my $v = &lookup_mac_vendor(
$hard->{'values'}->[1]);
push(@cols, &html_escape($v));
}
local $client = &find('client-hostname', $mems);
push(@cols, $client ? "<tt>".&html_escape(
$client->{'values'}->[0])."</tt>"

23055
dhcpd/mac-vendor.txt Normal file
View File

File diff suppressed because it is too large Load Diff