From patchwork Tue Sep 3 21:46:24 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Alexander Koch
X-Patchwork-Id: 2393
Return-Path:
Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384
client-signature ECDSA (P-384) client-digest SHA384)
(Client CN "mail01.haj.ipfire.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by web04.haj.ipfire.org (Postfix) with ESMTPS id 46NLBX1fGHz3yVW
for ; Tue, 3 Sep 2019 21:46:44 +0000 (UTC)
Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384
client-signature ECDSA (P-384) client-digest SHA384)
(Client CN "mail02.haj.ipfire.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mail01.ipfire.org (Postfix) with ESMTPS id 46NLBQ6DJkz3pM;
Tue, 3 Sep 2019 21:46:38 +0000 (UTC)
Received: from mail02.haj.ipfire.org (localhost [127.0.0.1])
by mail02.haj.ipfire.org (Postfix) with ESMTP id 46NLBQ2KlYz2ycq;
Tue, 3 Sep 2019 21:46:38 +0000 (UTC)
Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature ECDSA (P-384)
client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mail02.haj.ipfire.org (Postfix) with ESMTPS id 46NLBN3T6qz2ycq
for ; Tue, 3 Sep 2019 21:46:36 +0000 (UTC)
Received: from nx101.node02.secure-mailgate.com
(nx101.node02.secure-mailgate.com [192.162.87.101])
(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mail01.ipfire.org (Postfix) with ESMTPS id 46NLBM2lvGz3pH
for ; Tue, 3 Sep 2019 21:46:35 +0000 (UTC)
Received: from dehamd003.servertools24.de ([31.47.254.18])
by node02.secure-mailgate.com with esmtps
(TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89)
(envelope-from ) id 1i5GdA-00066f-TF
for development@lists.ipfire.org; Tue, 03 Sep 2019 23:46:29 +0200
Received: from starkstromlahn.spdns.org
(dslb-002-205-034-161.002.205.pools.vodafone-ip.de [2.205.34.161])
by dehamd003.servertools24.de (Postfix) with ESMTPSA id 9B8F3814CD
for ; Tue, 3 Sep 2019 23:46:25 +0200 (CEST)
Received-SPF: pass (dehamd003.servertools24.de: connection is authenticated)
From: Alex Koch
To: development@lists.ipfire.org
Subject: [PATCH 2/2] zoneconf: Add status output of "brctl show" and "ip addr"
Date: Tue, 3 Sep 2019 23:46:24 +0200
Message-Id: <20190903214624.2280-3-ipfire@starkstromkonsument.de>
In-Reply-To: <20190903214624.2280-1-ipfire@starkstromkonsument.de>
References: <20190903214624.2280-1-ipfire@starkstromkonsument.de>
MIME-Version: 1.0
X-PPP-Message-ID: <20190903214625.18752.76220@dehamd003.servertools24.de>
X-PPP-Vhost: starkstromkonsument.de
X-Originating-IP: 31.47.254.18
X-SecureMailgate-Domain: dehamd003.servertools24.de
X-SecureMailgate-Username: 31.47.254.18
X-SecureMailgate-Outgoing-Class: ham
X-SecureMailgate-Outgoing-Evidence: SB/global_tokens (0.00999655151783)
X-Recommended-Action: accept
X-Filter-ID:
Mvzo4OR0dZXEDF/gcnlw0duM4P579sYYbdH8Mt+sPVWpSDasLI4SayDByyq9LIhV7S63jduneIna
Jaojkbra/ETNWdUk1Ol2OGx3IfrIJKywOmJyM1qr8uRnWBrbSAGDjJTO55kJBbv01x7dn2l3rPNh
vhTXFC3uEZfNFh1aVkTnx8yeplRO3sLIqUlSH7OGRExDZINmEQIbSQHnexIqXYMlhcTgOXSCz8qb
ysTVYVkaLnpCEJIWxWTJBf3FFLEmu3xsQHMYnlKQ9pcJ+5Uh0/FACMa4l/3pd4b5Oy6wVMG0HaDh
DXN/mjGHOfSFZ+g8CzCvRwvqVEAQMkdN/mM3fI6jSvfpO+1kZkomjtjB6X7/nuj3koRhn2BlE7dX
oT0pcbRIdQWM2NQMFh4QV224OAeB7iXwS+ET8xu8PinDjLaQeETIza2ISn5dEgBRzdTORAwX31WV
Y5lWjWxuGSRuxWXf5NNoWqxwzT7YQb2bq3vnsXEBAaJKYpjfiKWbEgl3RcHB+3LImIav+XghtcEX
W9ezYqxGMqsKjARq8PBC4qjZV9WUj+EyIrGvUGbmcW3GOgXVzBtkRwm2F5tMl6E+vbdY2rW50fd1
ekaDpmIWc1Vmt3mnxMTQMQWbvBqEXskTQn6USYs98Imn+lZXe3dwYfgVB1xo6dCfBaU/iegBU8b/
+8wYw8YLdUUfV0okZfkhkei+5uw9w6YGNoEzAd36Fns1Ag2Lmiym40sadtn2UCF+FdbF4VlQSb+U
43T+5Kq7AXG2iC6lP3huS6GtPmIDHYv27a5pYQvOTpJiUWfpstn2eLjtW8W4mPhCkKh6KQS35r7C
+o0agu/oaXt0kg0deCvnuiSW7MGRpLhmoMCxaFt0DXVaxwIPCD+0/Cl6ITyhZ3v5s+VV64tAm1Sv
wE7msja8e8prcn5Nt0aZc1zMaVw4pnlHvxAvFYa7lZ6+MLyDfqb5R4VemuUI6bcEARsm0MEjkUih
zXyfUNRKqxWVHcbaJKO3HOGjSneIR02FBm0irnnSv2dzL5wMg5rjmgOQhvAZcJMXyXxXG5oZWE62
IcFjeqXTdHEJmJY9YZR+guDvIhQ2+jHZPPbhtlV5fVM0fqpm8YPEk1IAuJfnuAPEbXG8uVC9ZwGn
5e04Ydb+dvG2
X-Report-Abuse-To: spam@node01.secure-mailgate.com
Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none;
spf=pass (mail01.ipfire.org: domain of ipfire@starkstromkonsument.de
designates 192.162.87.101 as permitted sender)
smtp.mailfrom=ipfire@starkstromkonsument.de
X-Rspamd-Queue-Id: 46NLBM2lvGz3pH
X-Spamd-Result: default: False [0.69 / 11.00]; ARC_NA(0.00)[];
RCVD_VIA_SMTP_AUTH(0.00)[]; HAS_XOIP(0.00)[];
FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:192.162.87.0/24];
TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[];
PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org];
TO_DN_NONE(0.00)[]; MIME_GOOD(-0.10)[text/plain];
RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3];
DMARC_NA(0.00)[starkstromkonsument.de];
MX_GOOD(-0.01)[cached: mail.starkstromkonsument.de];
MID_CONTAINS_FROM(1.00)[]; IP_SCORE(0.00)[country: DE(0.00)];
RCVD_IN_DNSWL_FAIL(0.00)[101.87.162.192.list.dnswl.org:server fail];
R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+];
ASN(0.00)[asn:45031, ipnet:192.162.84.0/22, country:DE];
RCVD_TLS_ALL(0.00)[];
RECEIVED_SPAMHAUS_PBL(0.00)[161.34.205.2.zen.spamhaus.org : 127.0.0.11]
X-Rspamd-Server: mail01.haj.ipfire.org
X-BeenThere: development@lists.ipfire.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: IPFire development talk
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: development-bounces@lists.ipfire.org
Sender: "Development"
Signed-off-by: Alex Koch
---
html/cgi-bin/zoneconf.cgi | 23 +++++++++++++++++++++++
langs/de/cgi-bin/de.pl | 5 ++++-
langs/en/cgi-bin/en.pl | 5 ++++-
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index bb24347df..71b5c1550 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -97,6 +97,10 @@ my $css = <$Lang::tr{"zoneconf notice uptodate"}
+END
+;
+my $br_config = `brctl show`;
+print "$br_config
";
+&Header::closebox();
+
+&Header::openbox('100%', 'left', $Lang::tr{"zoneconf ip addr"});
+print <$Lang::tr{"zoneconf notice uptodate"}
+END
+;
+my $if_config = `ip addr`;
+print "$if_config
";
+&Header::closebox();
+
&Header::closebigbox();
&Header::closepage();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 2e67e495f..363f11213 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,4 +1,4 @@
-%tr = (
+%tr = (
%tr,
'24 hours' => '24 Stunden',
@@ -2905,11 +2905,14 @@
'zoneconf access native' => 'Nativ',
'zoneconf access none' => 'Keine',
'zoneconf access vlan' => 'VLAN',
+'zoneconf brctl show' => 'Status: Netzwerkbrücken',
+'zoneconf ip addr' => 'Status: Netzwerkkarten',
'zoneconf nic assignment' => 'Netzwerkkartenzuordnung',
'zoneconf nicmode bridge' => 'Brücke',
'zoneconf nicmode default' => 'Normal',
'zoneconf nicmode macvtap' => 'MacVTap',
'zoneconf notice reboot' => 'Bitte einen Neustart durchführen, um die Änderungen zu übernehmen.',
+'zoneconf notice uptodate' => 'ACHTUNG: Falls Änderungen an der Netzwerkkartenzuordnung vorgenommen wurden, werden diese hier erst nach einem Neustart angezeigt!',
'zoneconf title' => 'Zonen einrichten',
'zoneconf val native assignment error' => 'Eine Netzwerkkarte kann nicht von mehreren Zonen nativ verwendet werden.',
'zoneconf val ppp assignment error' => 'Die Netzwerkkarte, die von RED im PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 8b7e63cb8..d440d0528 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr = (
+%tr = (
%tr,
'24 hours' => '24 Hours',
@@ -2951,11 +2951,14 @@
'zoneconf access native' => 'Native',
'zoneconf access none' => 'None',
'zoneconf access vlan' => 'VLAN',
+'zoneconf brctl show' => 'Status: Bridges',
+'zoneconf ip addr' => 'Status: Interfaces',
'zoneconf nic assignment' => 'NIC Assignment',
'zoneconf nicmode bridge' => 'Bridge',
'zoneconf nicmode default' => 'Default',
'zoneconf nicmode macvtap' => 'MacVTtap',
'zoneconf notice reboot' => 'Please reboot to apply your changes.',
+'zoneconf notice uptodate' => 'Attention: If you changed your NIC Assignment, a reboot is required for the changes to be shown!',
'zoneconf title' => 'Zone Configuration',
'zoneconf val native assignment error' => 'A NIC cannot be accessed natively by more than one zone.',
'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode cannot be accessed by any other zone.',