diff options
| author | Bill Marquette <bill.marquette@gmail.com> | 2011-05-14 17:44:40 -0500 |
|---|---|---|
| committer | Bill Marquette <bill.marquette@gmail.com> | 2011-05-14 17:44:40 -0500 |
| commit | 325e316391adaaf2968aadd385c3b8d3ed08569b (patch) | |
| tree | d65b96d96f6383f9a1ed090b3df79649a84da47a /etc/inc/pfsense-utils.inc | |
| parent | 3f9492a77093865d4fdebfa76d6a7fdd6161f129 (diff) | |
| parent | 4450527f90d05a6d267ed376e968935ed99382e8 (diff) | |
| download | pfsense-325e316391adaaf2968aadd385c3b8d3ed08569b.zip pfsense-325e316391adaaf2968aadd385c3b8d3ed08569b.tar.gz | |
Merge branch 'master' into smos-ipv6
Conflicts:
etc/inc/pfsense-utils.inc
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index e00c6b9..c48cb31 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2242,4 +2242,28 @@ function generate_ipv6_from_mac($mac) { } return $ipv6; } + +/****f* pfsense-utils/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=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; + +} ?> |
