From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 2/2] dhcp.cgi: Add column with resolved hostname by IP address
Date: Fri, 17 Nov 2023 13:41:33 +0100
Message-ID: <555550d1-25f9-4af7-8d62-e35cc681e6ed@ipfire.org>
In-Reply-To: <20231111093329.17037-1-sebastien.gislain@free.fr>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2633467806647592318=="
List-Id: <development.lists.ipfire.org>

--===============2633467806647592318==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hi Sebastien,


Sorry for my late response, After my last response I have been busy with othe=
r non IPFire related stuff.

You have made your patch v2 as a diff to your previous patch. That will not w=
ork. The previous patch will never be merged into the git repo and so your ne=
w patch will not find the lines to change.


You need to go back and do your patch based on the existing dhcp.cgi as previ=
ously. Then when running git format-patch, if you use that, you add -v2 and i=
t 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 pa=
tch will be ignored in the system as it will have been superseded by the V2 o=
ne.

It looks like the changes should fix the concerns I have but when you redo th=
e 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 c=
olumn 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=3D'100%' class=3D'tbl'>
>   <tr>
> -    <th width=3D'20%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?FETH=
ER'><b>$Lang::tr{'mac address'}</b></a></th>
> -    <th width=3D'20%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?FIPA=
DDR'><b>$Lang::tr{'ip address'}</b></a></th>
> -	<th width=3D'20%' align=3D'center'><b>$Lang::tr{'hostname'}</b></a></th>
> +    <th width=3D'15%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?FETH=
ER'><b>$Lang::tr{'mac address'}</b></a></th>
> +    <th width=3D'10%' align=3D'center'><a href=3D'$ENV{'SCRIPT_NAME'}?FIPA=
DDR'><b>$Lang::tr{'ip address'}</b></a></th>
> +    <th width=3D'15%' align=3D'center'><b>$Lang::tr{'hostname'}</b></th>
>       <th width=3D'15%' align=3D'center'><b>$Lang::tr{'remark'}</b></th>
>       <th width=3D'15%' class=3D'boldbase' align=3D'center'><b>next-server<=
/b></th>
>       <th width=3D'15%' class=3D'boldbase' align=3D'center'><b>filename</b>=
</th>
> @@ -1111,7 +1111,7 @@ foreach my $line (@current2) {
>   	# resolved name (if exists)
>   	my $iaddr =3D inet_aton($temp[1]);
>   	my $rname =3D gethostbyaddr($iaddr, AF_INET);
> -	if (!$rname || $rname eq "") { $rname =3D $Lang::tr{'lookup failed'}; }
> +	if (!$rname || $rname eq "") { $rname =3D $Lang::tr{'ptr lookup failed'};=
 }
>       print <<END
>   <td align=3D'center' $col>$TAG2$temp[0]$TAG3</td>
>   <td align=3D'center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>

--===============2633467806647592318==--