Commit f107116e authored by Ad Schellevis's avatar Ad Schellevis

ditch load_mac_manufacturer_table, replace with configd call

parent 5ad7adc6
......@@ -5152,33 +5152,6 @@ function get_ppp_uptime($port)
}
}
/****f* legacy/load_mac_manufacturer_table
* NAME
* load_mac_manufacturer_table
* INPUTS
* none
* RESULT
* returns associative array with MAC-Manufacturer pairs
******/
function load_mac_manufacturer_table() {
/* load MAC-Manufacture data from the file */
$macs = false;
if (file_exists("/usr/local/share/nmap/nmap-mac-prefixes")) {
$macs=file("/usr/local/share/nmap/nmap-mac-prefixes");
}
if ($macs){
foreach ($macs as $line){
if (preg_match('/([0-9A-Fa-f]{6}) (.*)$/', $line, $matches)){
/* store values like this $mac_man['000C29']='VMware' */
$mac_man["$matches[1]"]=$matches[2];
}
}
return $mac_man;
} else {
return -1;
}
}
/****f* legacy/is_ipaddr_configured
* NAME
* is_ipaddr_configured
......
#!/usr/local/bin/python2.7
"""
Copyright (c) 2016 Ad Schellevis
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------------
list known mac prefixes
"""
import os.path
import sys
import ujson
import netaddr.eui.ieee
if __name__ == '__main__':
result=dict()
if os.path.isfile(netaddr.eui.ieee.OUI_REGISTRY):
for line in open(netaddr.eui.ieee.OUI_REGISTRY).read().split('\n'):
if line.find('(base 16)') > -1:
parts=line.split('(base 16)')
if len(parts) >= 2:
result[parts[0].strip()] = parts[1].strip()
if len(sys.argv) > 1 and sys.argv[1] == 'json':
# output json
print(ujson.dumps(result))
else:
# output plain text (console)
print ('%-6s %s' % ('prefix', 'manufacturer'))
for mac_prefix in result:
print ('%s %s' % (mac_prefix, result[mac_prefix]))
......@@ -60,6 +60,12 @@ parameters: %s
type:script_output
message:request ndp table
[list.macdb]
command:/usr/local/opnsense/scripts/interfaces/list_macdb.py
parameters: %s
type:script_output
message:request mac table
[routes.list]
command:/usr/local/opnsense/scripts/routes/show_routes.py
parameters:%s %s
......
......@@ -369,7 +369,7 @@ include("head.inc");?>
<tbody>
<?php
// Load MAC-Manufacturer table
$mac_man = load_mac_manufacturer_table();
$mac_man = json_decode(configd_run("interface list macdb json"), true);
legacy_html_escape_form_data($leases);
foreach ($leases as $data):
if (!($data['act'] == "active" || $data['act'] == "static" || $_GET['all'] == 1)) {
......
......@@ -440,7 +440,7 @@ endif;?>
</thead>
<tbody>
<?php
$mac_man = load_mac_manufacturer_table();
$mac_man = json_decode(configd_run("interface list macdb json"), true);
foreach ($leases as $data):
if ($data['act'] == "static") {
foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
......
......@@ -71,8 +71,8 @@ include("head.inc");
legacy_html_escape_form_data($ifinfo);
$ifdescr = htmlspecialchars($ifdescr);
$ifname = htmlspecialchars($ifname);
// Load MAC-Manufacturer table
$mac_man = load_mac_manufacturer_table();?>
$mac_man = json_decode(configd_run("interface list macdb json"), true);
?>
<div class="tab-content content-box col-xs-12 __mb">
<div class="table-responsive">
<table class="table">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment