diff options
author | lukehamburg <luke.hamburg@gmail.com> | 2017-02-08 03:13:08 -0500 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-02-10 15:57:52 -0200 |
commit | 307243e7b7cb88283740ae29a2d6150cc59bc573 (patch) | |
tree | 857b98cc5c1aa9674f10939b9b8c13c50f4db164 /src/usr/local/www | |
parent | 9a20d17098ee74a96370aeeb0fd9a1fcf7f8d86c (diff) | |
download | pfsense-307243e7b7cb88283740ae29a2d6150cc59bc573.zip pfsense-307243e7b7cb88283740ae29a2d6150cc59bc573.tar.gz |
2nd try. . .
/etc/inc/util.inc:
- arp_get_mac_by_ip() updated to support IPv6
- attempt at code streamline
/usr/local/www/services_dhcp_edit.php:
- streamline code, now just a simple call to arp_get_mac_by_ip()
(cherry picked from commit dd83f869b79a858bd74c7a8bb4adcd49217445b0)
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/services_dhcp_edit.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index 02ac9d9..22bfbcf 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -405,18 +405,8 @@ if ($_POST) { // Get our MAC address $ip = $_SERVER['REMOTE_ADDR']; -switch (is_ipaddr($ip)) { - case 4: - $mymac = exec("/usr/sbin/arp -an | grep '('{$ip}')' | head -n 1 | cut -d' ' -f4"); - $mymac = str_replace("\n", "", $mymac); - break; - case 6: - $mymac = exec("/usr/sbin/ndp -na | /usr/bin/grep '{$ip}' | /usr/bin/head -n 1 | /usr/bin/awk '{ print $2 }'"); - $mymac = str_replace("\n", "", $mymac); - break; - default: - unset($mymac); -} +unset($mymac); +$mymac = arp_get_mac_by_ip($ip); $iflist = get_configured_interface_with_descr(); $ifname = ''; @@ -444,6 +434,7 @@ $macaddress = new Form_Input( $pconfig['mac'], ['placeholder' => 'xx:xx:xx:xx:xx:xx'] ); + $btnmymac = new Form_Button( 'btnmymac', 'Copy My MAC', @@ -452,6 +443,7 @@ $btnmymac = new Form_Button( ); $btnmymac->setAttribute('type','button')->removeClass('btn-primary')->addClass('btn-success btn-sm'); + $group = new Form_Group('MAC Address'); $group->add($macaddress); if (!empty($mymac)) { |