mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ADD: FTP - IPv6 support (issue #1483)

Browse source
This commit is contained in:
Alexander Koblov 2024-02-17 20:37:09 +03:00
commit 2a971d683c
2 changed files with 61 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/wfx/ftp/src/FtpConfDlg.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
Wfx plugin for working with File Transfer Protocol
Copyright (C) 2009-2023 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2009-2024 Alexander Koblov (alexx2000@mail.ru)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@ -37,7 +37,8 @@ function ShowFtpConfDlg(Connection: TConnection): Boolean;
implementation
uses
LazUTF8, DynLibs, FtpUtils, blcksock, ssl_openssl_lib, libssh, FtpProxy, TypInfo;
LazUTF8, DynLibs, FtpUtils, blcksock, synaip, ssl_openssl_lib, libssh,
FtpProxy, TypInfo;
var
ProxyIndex: Integer;
@ -249,10 +250,13 @@ begin
Data:= PtrInt(PAnsiChar(Text));
SendDlgMsg(pDlg, 'edtName', DM_SETTEXT, Data, 0);
Text:= gConnection.Host;
if gConnection.Port <> EmptyStr then
begin
if IsIP6(Text) then Text := '[' + Text + ']';
Text += ':' + gConnection.Port;
end;
if gConnection.FullSSL then
Text:= 'ftps://' + Text;
if gConnection.Port <> EmptyStr then
Text:= Text + ':' + gConnection.Port;
Data:= PtrInt(PAnsiChar(Text));
SendDlgMsg(pDlg, 'edtHost', DM_SETTEXT, Data, 0);
Text:= gConnection.UserName;

67
plugins/wfx/ftp/src/ftputils.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
WFX plugin for working with File Transfer Protocol
Copyright (C) 2009-2018 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2009-2024 Alexander Koblov (alexx2000@mail.ru)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@ -50,7 +50,7 @@ function DecodeMachineTime(const Time: String): TDateTime;
implementation
uses
Base64, DateUtils, synautil
Base64, DateUtils, synautil, synaip
{$IFDEF MSWINDOWS}
, Windows
{$ELSE}
@ -58,6 +58,22 @@ uses
{$ENDIF}
;
function IsIPv6(Value: String): Boolean;
var
Index: Integer;
begin
Index:= Pos('[', Value);
if Index = 1 then
begin
Index:= Pos(']', Value, Index + 1);
if Index > 0 then
begin
Value:= Copy(Value, 2, Index - 2);
end;
end;
Result:= IsIP6(Value);
end;
function StrToIp(Value: String): LongWord;
var
S: String;
@ -173,30 +189,53 @@ end;
function ExtractConnectionHost(Connection: AnsiString): AnsiString;
var
I: Integer;
Index: Integer;
begin
I:= Pos('://', Connection);
if I > 0 then Delete(Connection, 1, I + 2);
I:= Pos(':', Connection);
if I > 0 then
Result:= Copy(Connection, 1, I - 1)
else
Result:= Connection;
Index:= Pos('://', Connection);
if Index > 0 then Delete(Connection, 1, Index + 2);
if IsIPv6(Connection) then
begin
Index:= Pos('[', Connection);
if Index = 1 then
begin
Index:= Pos(']', Connection, Index + 1);
if Index > 0 then
begin
Connection:= Copy(Connection, 2, Index - 2);
end;
end;
end
else begin
Index:= Pos(':', Connection);
if Index > 0 then Connection:= Copy(Connection, 1, Index - 1)
end;
Result:= Connection;
end;
function ExtractConnectionPort(Connection: AnsiString): AnsiString;
var
I, J: Integer;
begin
Result:= EmptyStr;
I:= Pos('://', Connection);
if I > 0 then Delete(Connection, 1, I + 2);
I:= Pos(':', Connection);
if I > 0 then
if IsIPv6(Connection) then
begin
I:= Pos(']:', Connection);
if I > 0 then Delete(Connection, 1, I + 1);
end
else begin
I:= Pos(':', Connection);
if I > 0 then Delete(Connection, 1, I);
end;
if I = 0 then
Result:= EmptyStr
else begin
J:= Pos('/', Connection);
if J = 0 then J:= MaxInt;
Result:= Trim(Copy(Connection, I + 1, J - I - 1));
Result:= Trim(Copy(Connection, 1, J - 1));
end;
end;