summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/services_dhcp_edit.php
diff options
context:
space:
mode:
authorlukehamburg <luke.hamburg@gmail.com>2017-02-08 03:13:08 -0500
committerlukehamburg <luke.hamburg@gmail.com>2017-02-08 03:13:08 -0500
commitdd83f869b79a858bd74c7a8bb4adcd49217445b0 (patch)
tree03d2b442e3d3e105e238ae3c0f8150df32dcca08 /src/usr/local/www/services_dhcp_edit.php
parent478e89190a295b48d221ddf2f683cac6f02d7012 (diff)
downloadpfsense-dd83f869b79a858bd74c7a8bb4adcd49217445b0.zip
pfsense-dd83f869b79a858bd74c7a8bb4adcd49217445b0.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()
Diffstat (limited to 'src/usr/local/www/services_dhcp_edit.php')
-rw-r--r--src/usr/local/www/services_dhcp_edit.php16
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 9b5df91..8ec64bb 100644
--- a/src/usr/local/www/services_dhcp_edit.php
+++ b/src/usr/local/www/services_dhcp_edit.php
@@ -386,18 +386,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 = '';
@@ -426,6 +416,7 @@ $macaddress = new Form_Input(
$pconfig['mac'],
['placeholder' => 'xx:xx:xx:xx:xx:xx']
);
+
$btnmymac = new Form_Button(
'btnmymac',
'Copy My MAC',
@@ -434,6 +425,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)) {
OpenPOWER on IntegriCloud