mirror of
https://github.com/lucaspalomodevelop/core.git
synced 2026-03-15 09:04:39 +00:00
interfaces: rework ping tool #1257
This commit is contained in:
Franco Fichtner
parent
7b0d16ec54
commit
2e968357b4
@ -1,40 +1,38 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
Copyright (C) 2016 Deciso B.V.
|
||||
Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com>
|
||||
Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>
|
||||
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.
|
||||
*/
|
||||
* Copyright (C) 2018 Franco Fichtner <franco@opnsense.org>
|
||||
* Copyright (C) 2016 Deciso B.V.
|
||||
* Copyright (C) 2003-2005 Bob Zoller <bob@kludgebox.com>
|
||||
* Copyright (C) 2003-2005 Manuel Kasper <mk@neon1.net>
|
||||
* 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.
|
||||
*/
|
||||
|
||||
require_once("guiconfig.inc");
|
||||
require_once("system.inc");
|
||||
require_once("interfaces.inc");
|
||||
|
||||
define('MAX_COUNT', 10);
|
||||
define('DEFAULT_COUNT', 3);
|
||||
|
||||
$cmd_output = false;
|
||||
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
// set form defaults
|
||||
@ -51,39 +49,32 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
|
||||
$reqdfieldsn = array(gettext("Host"),gettext("Count"));
|
||||
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
|
||||
|
||||
if (!is_numeric($pconfig['count']) || $pconfig['count'] < 1 || $pconfig['count'] > MAX_COUNT) {
|
||||
$input_errors[] = sprintf(gettext("Count must be between 1 and %s"), MAX_COUNT);
|
||||
}
|
||||
if ($pconfig['ipproto'] == "ipv4" && is_ipaddrv6(trim($pconfig['host']))) {
|
||||
$input_errors[] = gettext("When using IPv4, the target host must be an IPv4 address or hostname.");
|
||||
} elseif ($pconfig['ipproto'] == "ipv6" && is_ipaddrv4(trim($pconfig['host']))) {
|
||||
$input_errors[] = gettext("When using IPv6, the target host must be an IPv6 address or hostname.");
|
||||
}
|
||||
if (count($input_errors) == 0) {
|
||||
$ifscope = '';
|
||||
$command = "/sbin/ping";
|
||||
if ($pconfig['ipproto'] == "ipv6") {
|
||||
$command .= "6";
|
||||
$ifaddr = is_ipaddr($pconfig['sourceip']) ? $pconfig['sourceip'] : get_interface_ipv6($pconfig['sourceip']);
|
||||
if (is_linklocal($ifaddr)) {
|
||||
$ifscope = get_ll_scope($ifaddr);
|
||||
}
|
||||
} else {
|
||||
$ifaddr = is_ipaddr($pconfig['sourceip']) ? $pconfig['sourceip'] : get_interface_ip($pconfig['sourceip']);
|
||||
$command = '/sbin/ping';
|
||||
switch ($pconfig['ipproto']) {
|
||||
case 'ipv6':
|
||||
$command .= '6';
|
||||
$ifaddr = find_interface_ipv6(get_real_interface($pconfig['interface'], 'inet6'));
|
||||
break;
|
||||
case 'ipv6-ll':
|
||||
$command .= '6';
|
||||
$realif = get_real_interface($pconfig['interface'], 'inet6');
|
||||
$ifaddr = find_interface_ipv6_ll($realif) . "%{$realif}";
|
||||
break;
|
||||
default:
|
||||
$ifaddr = find_interface_ip(get_real_interface($pconfig['interface']));
|
||||
break;
|
||||
}
|
||||
$host = trim($pconfig['host']);
|
||||
$srcip = "";
|
||||
if (!empty($ifaddr) && (is_ipaddr($pconfig['host']) || is_hostname($pconfig['host']))) {
|
||||
$srcip = "-S" . escapeshellarg($ifaddr);
|
||||
if (is_linklocal($pconfig['host']) && !strstr($pconfig['host'], "%") && !empty($ifscope)) {
|
||||
$host .= "%{$ifscope}";
|
||||
}
|
||||
$srcip = '';
|
||||
if (!empty($ifaddr)) {
|
||||
$srcip = exec_safe('-S %s ', $ifaddr);
|
||||
}
|
||||
// execute ping command and catch both stdout and stderr
|
||||
$cmd_action = "{$command} {$srcip} -c" . escapeshellarg($pconfig['count']) . " " . escapeshellarg($host);
|
||||
$cmd_action = "{$command} {$srcip}" . exec_safe('-c %s %s', array($pconfig['count'], $pconfig['host']));
|
||||
$process = proc_open($cmd_action, array(array("pipe", "r"), array("pipe", "w"), array("pipe", "w")), $pipes);
|
||||
if (is_resource($process)) {
|
||||
$cmd_output = stream_get_contents($pipes[1]);
|
||||
$cmd_output = "# $cmd_action\n";
|
||||
$cmd_output .= stream_get_contents($pipes[1]);
|
||||
$cmd_output .= stream_get_contents($pipes[2]);
|
||||
}
|
||||
}
|
||||
@ -100,14 +91,9 @@ include("head.inc"); ?>
|
||||
<section class="col-xs-12">
|
||||
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
|
||||
<div class="content-box">
|
||||
<header class="content-box-head container-fluid">
|
||||
<h3><?=gettext("Ping"); ?></h3>
|
||||
</header>
|
||||
<div class="content-box-main">
|
||||
<form method="post" name="iform" id="iform">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped __nomb">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><?=gettext("Host"); ?></td>
|
||||
<td><input name="host" type="text" value="<?=$pconfig['host'];?>" /></td>
|
||||
@ -118,21 +104,20 @@ include("head.inc"); ?>
|
||||
<select name="ipproto" class="selectpicker">
|
||||
<option value="ipv4" <?=$pconfig['ipproto'] == "ipv4" ? "selected=\"selected\"" : "";?>><?= gettext('IPv4') ?></option>
|
||||
<option value="ipv6" <?=$pconfig['ipproto'] == "ipv6" ? "selected=\"selected\"" : "";?>><?= gettext('IPv6') ?></option>
|
||||
<option value="ipv6-ll" <?=$pconfig['ipproto'] == "ipv6-ll" ? "selected=\"selected\"" : "";?>><?= gettext('IPv6 Link-Local') ?></option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><?=gettext("Source Address"); ?></td>
|
||||
<td>
|
||||
<select name="sourceip" class="selectpicker">
|
||||
<select name="interface" class="selectpicker">
|
||||
<option value=""><?= gettext('Default') ?></option>
|
||||
<?php
|
||||
foreach (get_possible_listen_ips(true) as $sip):?>
|
||||
<option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $pconfig['sourceip']) ? "selected=\"selected\"" : "";?>>
|
||||
<?=htmlspecialchars($sip['name']);?>
|
||||
<?php foreach (get_configured_interface_with_descr() as $ifname => $ifdescr): ?>
|
||||
<option value="<?= html_safe($ifname) ?>" <?=!link_interface_to_bridge($ifname) && $ifname == $pconfig['interface'] ? 'selected="selected"' : '' ?>>
|
||||
<?= htmlspecialchars($ifdescr) ?>
|
||||
</option>
|
||||
<?php
|
||||
endforeach; ?>
|
||||
<?php endforeach ?>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
@ -141,7 +126,7 @@ include("head.inc"); ?>
|
||||
<td>
|
||||
<select name="count" class="selectpicker" id="count">
|
||||
<?php
|
||||
for ($i = 1; $i <= MAX_COUNT; $i++): ?>
|
||||
for ($i = 1; $i <= 10; $i++): ?>
|
||||
<option value="<?=$i;?>" <?=$i == $pconfig['count'] ? "selected=\"selected\"" : ""; ?>>
|
||||
<?=$i;?>
|
||||
</option>
|
||||
@ -152,30 +137,21 @@ include("head.inc"); ?>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> </td>
|
||||
<td><input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Ping"); ?>" /></td>
|
||||
<td><button name="submit" type="submit" class="btn btn-primary" value="yes"><?= html_safe(gettext('Ping')) ?></button></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<?php
|
||||
if ( $cmd_output !== false):?>
|
||||
<?php if (!empty($cmd_output)): ?>
|
||||
<section class="col-xs-12">
|
||||
<div class="content-box">
|
||||
<header class="content-box-head container-fluid">
|
||||
<h3><?=gettext("Ping output"); ?></h3>
|
||||
</header>
|
||||
<div class="content-box-main col-xs-12">
|
||||
<pre><?=$cmd_output;?></pre>
|
||||
</div>
|
||||
</div>
|
||||
<pre><?=$cmd_output;?></pre>
|
||||
</section>
|
||||
<?php
|
||||
endif;?>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<?php include('foot.inc'); ?>
|
||||
<?php
|
||||
|
||||
include('foot.inc');
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user