Message ID | 20231111093329.17037-1-sebastien.gislain@free.fr |
---|---|
State | Rejected |
Headers |
Return-Path: <development-bounces@lists.ipfire.org> 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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4SS9VQ6hxkz3wfv for <patchwork@web04.haj.ipfire.org>; Sat, 11 Nov 2023 09:33:34 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SS9VQ36Q0zWR; Sat, 11 Nov 2023 09:33:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4SS9VQ2bwXz303X; Sat, 11 Nov 2023 09:33:34 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4SS9VN5phnz2xFt for <development@lists.ipfire.org>; Sat, 11 Nov 2023 09:33:32 +0000 (UTC) Received: from smtp.smtpout.orange.fr (smtp-22.smtpout.orange.fr [80.12.242.22]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "*.smtpout.orange.fr", Issuer "DigiCert Global G2 TLS RSA SHA256 2020 CA1" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4SS9VN0j9GzHQ for <development@lists.ipfire.org>; Sat, 11 Nov 2023 09:33:32 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=wanadoo.fr header.s=t20230301 header.b="Pa3hv/Nt"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=free.fr (policy=none); spf=neutral (mail01.ipfire.org: 80.12.242.22 is neither permitted nor denied by domain of sebastien.gislain@free.fr) smtp.mailfrom=sebastien.gislain@free.fr ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1699695212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=qH30n3xEOW7R47GLOVd9n6EvJqLFFHaiXvZL1JAhKi4=; b=U3vNCtXGE7+758Fakb4/JjXeAghmyaRixPvqmw3ZfeJQRKqDsIYBNak7rWpHBpXnig0veI 7SdPhUBVylfd9YlyfTtnqqgNlTd7F6pkIK8uQniCxrZxBmS0WvkmSmI+UaFhn5Jpau7mif 7LYDXrghz5kV+Rq39rxfR0a+gB+DxMIEmZHQDncKU46FmbeuPh+e6mhtqEMY1/xyT3C49B sL4Cu/KsMTDLd4WvYzeX9Ns6ioAZ56oreMkXoc/kh5jtkbrcQ9qLMClHH0ikNN12OfjV9O Za/QbCiWWF6U2hSdOKspXqRzgd0sfdP8TeE2rUWKJBoePrGnVdNikyEGJedwHg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=wanadoo.fr header.s=t20230301 header.b="Pa3hv/Nt"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=free.fr (policy=none); spf=neutral (mail01.ipfire.org: 80.12.242.22 is neither permitted nor denied by domain of sebastien.gislain@free.fr) smtp.mailfrom=sebastien.gislain@free.fr ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1699695212; a=rsa-sha256; cv=none; b=Eq0O2WUpfx9+z0Fh+PjnXu/CUEkzfCNY3cLFJEu/M+teUL9ho4/7Ke2YFShKbvZKaHlGKV ckxpeGZaw/22gn8TUCJjJXjzrSQp11D3jbLih6fdgtDPLcvaEphD3cQqB5kfuFrwjiQClO pxpeRqstuy16P9nW4l2cWMVJMW8kQyLNAGFX+Ulfv2Y4GK7ZUXN5HtTT0aHAVcuyUcuO3q qsRFg7RX571+S72UKToqCPTXM7V1mG8uw7eRvoWqWFaTcyAhetUsFReQF8ORqEmGPLZ2Uu ssjeyuMg/J3FYaIN8SwJlmvXZZLW/XVZrBGQQlXrZrGzVa8ODP5dhdUTAy8seg== Received: from esx052.local ([90.16.56.107]) by smtp.orange.fr with ESMTPA id 1kMsrVHq1Cevt1kMtrTDFl; Sat, 11 Nov 2023 10:33:31 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1699695211; bh=qH30n3xEOW7R47GLOVd9n6EvJqLFFHaiXvZL1JAhKi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pa3hv/NtpUpqbUw3wqMjqO2rRFhCushDvD2xEtjCJnrZmlqOEQ3fYcHTY8bR9wXo2 RQOyN79fLDBgMfsg+c1HH8hgB/lXj49/qfIripe5uVggbZbIaweBy0/qsQ+fhlyDyS UVgVVtuaFVe1Jd0Pv96i3xvWED7Ot8mYfn7zmPwiGXIrco5kGpI5tVfonGJhdPypEL 39vDDWtSn7oCXV6y3wFUP/JX+qtKeWgGiEoVyi8vYgLs3XEIGDMURsgYrp41bFLDuB YGk+IDSPmz6lVNU6cvDjmX4fdQ5IoQax6CAH1uGy/J5SXPpSQCUsxctm39CyDQoDMI n2nchSsHBzumw== X-ME-Helo: esx052.local X-ME-Auth: Z2lzbGFpbi5zZWJhc3RpZW5Ab3JhbmdlLmZy X-ME-Date: Sat, 11 Nov 2023 10:33:31 +0100 X-ME-IP: 90.16.56.107 From: Sebastien GISLAIN <sebastien.gislain@free.fr> To: development@lists.ipfire.org Subject: [PATCH 2/2] dhcp.cgi: Add column with resolved hostname by IP address Date: Sat, 11 Nov 2023 10:33:29 +0100 Message-Id: <20231111093329.17037-1-sebastien.gislain@free.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <sebastien.gislain@free.fr> References: <sebastien.gislain@free.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4SS9VN0j9GzHQ X-Spamd-Result: default: False [-2.68 / 11.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; RWL_MAILSPIKE_EXCELLENT(-0.40)[80.12.242.22:from]; MIME_HTML_ONLY(0.20)[]; R_DKIM_ALLOW(-0.20)[wanadoo.fr:s=t20230301]; DMARC_POLICY_SOFTFAIL(0.10)[free.fr : No valid SPF, DKIM not aligned (relaxed),none]; ONCE_RECEIVED(0.10)[]; IP_REPUTATION_SPAM(0.03)[asn: 3215(0.00), country: FR(0.01), ip: 80.12.242.22(0.00)]; MX_GOOD(-0.01)[]; RCVD_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; R_SPF_NEUTRAL(0.00)[?all:c]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:~]; FREEMAIL_FROM(0.00)[free.fr]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[wanadoo.fr:dkim]; FREEMAIL_ENVFROM(0.00)[free.fr]; ASN(0.00)[asn:3215, ipnet:80.12.240.0/20, country:FR]; RECEIVED_SPAMHAUS_PBL(0.00)[90.16.56.107:received]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DKIM_TRACE(0.00)[wanadoo.fr:+]; DKIM_REPUTATION(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_CC(0.00)[free.fr]; FROM_HAS_DN(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[80.12.242.22:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1] X-Rspamd-Action: no action Message-ID-Hash: 3FN4QWD5HBBV4NAHH5DTC5Z52HR3TJH4 X-Message-ID-Hash: 3FN4QWD5HBBV4NAHH5DTC5Z52HR3TJH4 X-MailFrom: sebastien.gislain@free.fr X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Sebastien GISLAIN <sebastien.gislain@free.fr> X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> Archived-At: <https://lists.ipfire.org/mailman3/hyperkitty/list/development@lists.ipfire.org/message/3FN4QWD5HBBV4NAHH5DTC5Z52HR3TJH4/> List-Archive: <https://lists.ipfire.org/mailman3/hyperkitty/list/development@lists.ipfire.org/> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Owner: <mailto:development-owner@lists.ipfire.org> List-Post: <mailto:development@lists.ipfire.org> List-Subscribe: <mailto:development-join@lists.ipfire.org> List-Unsubscribe: <mailto:development-leave@lists.ipfire.org> |
Series |
Add column with resolved hostname by IP address
|
|
Commit Message
Sebastien GISLAIN
Nov. 11, 2023, 9:33 a.m. UTC
In web interface, on page DHCP Server, in table Current fixed leases, add column with resolved hostname by IP address --- html/cgi-bin/dhcp.cgi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Comments
Hi Sebastien, Sorry for my late response, After my last response I have been busy with other non IPFire related stuff. You have made your patch v2 as a diff to your previous patch. That will not work. The previous patch will never be merged into the git repo and so your new patch will not find the lines to change. You need to go back and do your patch based on the existing dhcp.cgi as previously. Then when running git format-patch, if you use that, you add -v2 and it will create a V2 patch for you. (Yes it should be a lower case v). If not using git format-patch but doing the patch creation manually then you need to end up with [PATCH V2] in the subject line. That way, the previous patch will be ignored in the system as it will have been superseded by the V2 one. It looks like the changes should fix the concerns I have but when you redo the V2 patch version I will test it out and report back what I find. Best regards, Adolf. On 11/11/2023 10:33, Sebastien GISLAIN wrote: > In web interface, on page DHCP Server, in table Current fixed leases, add column with resolved hostname by IP address > --- > html/cgi-bin/dhcp.cgi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi > index aabf565d7..b87da6907 100755 > --- a/html/cgi-bin/dhcp.cgi > +++ b/html/cgi-bin/dhcp.cgi > @@ -1008,9 +1008,9 @@ END > print <<END > <table width='100%' class='tbl'> > <tr> > - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> > - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th> > - <th width='20%' align='center'><b>$Lang::tr{'hostname'}</b></a></th> > + <th width='15%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> > + <th width='10%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th> > + <th width='15%' align='center'><b>$Lang::tr{'hostname'}</b></th> > <th width='15%' align='center'><b>$Lang::tr{'remark'}</b></th> > <th width='15%' class='boldbase' align='center'><b>next-server</b></th> > <th width='15%' class='boldbase' align='center'><b>filename</b></th> > @@ -1111,7 +1111,7 @@ foreach my $line (@current2) { > # resolved name (if exists) > my $iaddr = inet_aton($temp[1]); > my $rname = gethostbyaddr($iaddr, AF_INET); > - if (!$rname || $rname eq "") { $rname = $Lang::tr{'lookup failed'}; } > + if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup failed'}; } > print <<END > <td align='center' $col>$TAG2$temp[0]$TAG3</td> > <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
Hi Adolf, Thank you for your reply. I'm sorry: Git is not my "natural language"! To go back, I re-cloned the IPFire Git repository, reapplied my changes, and resent the patch email. I hope it'll be OK... Regards, Sébastien Le 17/11/2023 à 13:41, Adolf Belka a écrit : > Hi Sebastien, > > > Sorry for my late response, After my last response I have been busy > with other non IPFire related stuff. > > You have made your patch v2 as a diff to your previous patch. That > will not work. The previous patch will never be merged into the git > repo and so your new patch will not find the lines to change. > > > You need to go back and do your patch based on the existing dhcp.cgi > as previously. Then when running git format-patch, if you use that, > you add -v2 and it will create a V2 patch for you. (Yes it should be a > lower case v). > > If not using git format-patch but doing the patch creation manually > then you need to end up with [PATCH V2] in the subject line. That way, > the previous patch will be ignored in the system as it will have been > superseded by the V2 one. > > It looks like the changes should fix the concerns I have but when you > redo the V2 patch version I will test it out and report back what I find. > > > Best regards, > > Adolf. > > On 11/11/2023 10:33, Sebastien GISLAIN wrote: >> In web interface, on page DHCP Server, in table Current fixed leases, >> add column with resolved hostname by IP address >> --- >> html/cgi-bin/dhcp.cgi | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi >> index aabf565d7..b87da6907 100755 >> --- a/html/cgi-bin/dhcp.cgi >> +++ b/html/cgi-bin/dhcp.cgi >> @@ -1008,9 +1008,9 @@ END >> print <<END >> <table width='100%' class='tbl'> >> <tr> >> - <th width='20%' align='center'><a >> href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac >> address'}</b></a></th> >> - <th width='20%' align='center'><a >> href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip >> address'}</b></a></th> >> - <th width='20%' align='center'><b>$Lang::tr{'hostname'}</b></a></th> >> + <th width='15%' align='center'><a >> href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac >> address'}</b></a></th> >> + <th width='10%' align='center'><a >> href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip >> address'}</b></a></th> >> + <th width='15%' align='center'><b>$Lang::tr{'hostname'}</b></th> >> <th width='15%' align='center'><b>$Lang::tr{'remark'}</b></th> >> <th width='15%' class='boldbase' >> align='center'><b>next-server</b></th> >> <th width='15%' class='boldbase' >> align='center'><b>filename</b></th> >> @@ -1111,7 +1111,7 @@ foreach my $line (@current2) { >> # resolved name (if exists) >> my $iaddr = inet_aton($temp[1]); >> my $rname = gethostbyaddr($iaddr, AF_INET); >> - if (!$rname || $rname eq "") { $rname = $Lang::tr{'lookup >> failed'}; } >> + if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup >> failed'}; } >> print <<END >> <td align='center' $col>$TAG2$temp[0]$TAG3</td> >> <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi index aabf565d7..b87da6907 100755 --- a/html/cgi-bin/dhcp.cgi +++ b/html/cgi-bin/dhcp.cgi @@ -1008,9 +1008,9 @@ END print <<END <table width='100%' class='tbl'> <tr> - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> - <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th> - <th width='20%' align='center'><b>$Lang::tr{'hostname'}</b></a></th> + <th width='15%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th> + <th width='10%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th> + <th width='15%' align='center'><b>$Lang::tr{'hostname'}</b></th> <th width='15%' align='center'><b>$Lang::tr{'remark'}</b></th> <th width='15%' class='boldbase' align='center'><b>next-server</b></th> <th width='15%' class='boldbase' align='center'><b>filename</b></th> @@ -1111,7 +1111,7 @@ foreach my $line (@current2) { # resolved name (if exists) my $iaddr = inet_aton($temp[1]); my $rname = gethostbyaddr($iaddr, AF_INET); - if (!$rname || $rname eq "") { $rname = $Lang::tr{'lookup failed'}; } + if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup failed'}; } print <<END <td align='center' $col>$TAG2$temp[0]$TAG3</td> <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>