const
+ { Address families: }
+ { These are here so users of this unit don't necessarily have to
+ use Sockets as well. }
+ AF_UNSPEC = Sockets.AF_UNSPEC;
+ AF_INET = Sockets.AF_INET;
+ AF_INET6 = Sockets.AF_INET6;
+
{ Connection feature requests: }
NET_TCP_BASIC = 0;
NET_TCP_RFCSUPPORT = 1;
TTCPConnection = class
constructor Create; overload;
constructor Create(const HostName: string; Port: word); overload;
- constructor Create(Socket: socket; const Addr: TSockAddr); overload;
+ constructor Create(Socket: socket; const Addr: TSockAddr6); overload;
destructor Destroy; override;
private
FConnected: boolean;
FSocket: socket;
FHostIP: TIPNamePair;
FSockTimeOut: DWord;
- sAddr: TSockAddr;
+ SockAddr: TSockAddr6;
public
function Connect(const HostName: string; Port: word): boolean;
procedure Disconnect;
end;
TTCPListener = class(TThread)
- constructor Create(const Address: string; Port: word; FeatureRequest: word);
+ constructor Create(const Address: string; Port: word; Family: word; FeatureRequest: word);
{destructor Destroy; override;}
private
FFeatureRequest: word;
+ FFamily: word;
FListenAddress: string;
FListenPort: word;
FListenSocket: socket;
- sAddr: TSockAddr;
+ SockAddr: TSockAddr6;
protected
procedure HandleClient(Connection: TTCPConnection); virtual; abstract;
procedure Execute; override;
constructor TTCPConnection.Create(const HostName: string; Port: word);
{ Connect to the given port on the given hostname. }
begin
- inherited Create;
+ Create;
Connect(HostName, Port);
end;
-constructor TTCPConnection.Create(Socket: socket; const Addr: TSockAddr);
+constructor TTCPConnection.Create(Socket: socket; const Addr: TSockAddr6);
{ Use an already connected socket. }
begin
inherited Create;
FSocket:= Socket;
- sAddr:= Addr;
- FHostIP:= TIPNamePair.Create('', NetAddrToStr(Addr.sin_addr));
+ SockAddr:= Addr;
+ FHostIP:= TIPNamePair.Create('', IPToStr(@Addr));
FConnected:= true;
end;
end;
-constructor TTCPListener.Create(const Address: string; Port: word; FeatureRequest: word);
+constructor TTCPListener.Create(const Address: string; Port: word; Family: word; FeatureRequest: word);
begin
+ FFamily:= Family;
FListenAddress:= Address;
FListenPort:= Port;
FFeatureRequest:= FeatureRequest;
FreeOnTerminate:= false;
+ FillChar(SockAddr, SizeOf(SockAddr), 0);
inherited Create(true);
end;
function TTCPConnection.Connect(const HostName: string; Port: word): boolean;
{ Resolves the given hostname, and tries to connect it on the given port. }
+var GAIResult: TGAIResult;
begin
- FSocket:= fpSocket(af_inet, sock_stream, 0);
- if (FSocket <> -1) then begin
- with sAddr do begin
- sin_family:= af_inet;
- sin_port:= htons(Port);
- { Resolve hostname to IP address. }
- sin_addr:= ResolveHost(HostName);
- end;
+ GAIResult:= ResolveHost(HostName, AF_UNSPEC);
+ if GAIResult.GAIError = 0 then begin
+ Move(GAIResult.AddrInfo^.ai_addr^, SockAddr, GAIResult.AddrInfo^.ai_addrlen);
+ SockAddr.sin6_port:= htons(Port);
+
+ { Create socket. }
+ FSocket:= fpSocket(GAIResult.AddrInfo^.ai_family, SOCK_STREAM, 0);
+
+ if (FSocket <> -1) then begin
- if sAddr.sin_addr.s_addr <> 0 then
{ Try to initiate connection. }
- FConnected:= fpConnect(FSocket, @sAddr, SizeOf(sAddr)) <> -1;
+ FConnected:= fpConnect(FSocket, @SockAddr, GAIResult.AddrInfo^.ai_addrlen) <> -1;
- if FConnected then begin
- FHostIP:= TIPNamePair.Create(HostName, NetAddrToStr(sAddr.sin_addr));
- SetSockTimeOut(FSockTimeOut);
- end
- else
- CloseSocket(FSocket);
+ if FConnected then begin
+ FHostIP:= TIPNamePair.Create(HostName, IPToStr(@SockAddr));
+ SetSockTimeOut(FSockTimeOut);
+ end
+ else
+ CloseSocket(FSocket);
+
+ end;
+
+ FreeHost(GAIResult);
end;
Result:= FConnected;
end;
var NHostIP: TIPNamePair;
begin
if FConnected then begin
- NHostIP:= TIPNamePair.Create(ResolveIP(sAddr.sin_addr), FHostIP.IP);
+ NHostIP:= TIPNamePair.Create(ResolveIP(PSockAddr(@SockAddr)), FHostIP.IP);
FHostIP.Free;
FHostIP:= NHostIP;
end;
end;
function TTCPConnection.VerifyFCrDNS: boolean;
+var GAIResult: TGAIResult; ai: PAddrInfo;
begin
- Result:= NetAddrToStr(ResolveHost(HostIP.Name)) = HostIP.IP;
+ Result:= false;
+ GAIResult:= ResolveHost(HostIP.Name, AF_UNSPEC);
+ if GAIResult.GAIError = 0 then begin
+ ai:= GAIResult.AddrInfo;
+ { One of the addresses must match. }
+ while (ai <> nil) and not Result do begin
+ Result:= IPToStr(ai^.ai_addr) = HostIP.IP;
+ ai:= ai^.ai_next;
+ end;
+ end;
end;
procedure TTCPConnection.SetSockTimeOut(TimeOut: DWord);
function TTCPListener.StartListen: boolean;
+var GAIResult: TGAIResult;
begin
- FListenSocket:= fpSocket(af_inet, sock_stream, 0);
+ FListenSocket:= fpSocket(FFamily, SOCK_STREAM, 0);
if FListenSocket <> -1 then begin
- with sAddr do begin
- sin_family:= af_inet;
- sin_port:= htons(FListenPort);
- sin_addr:= ResolveHost(FListenAddress);
- end;
- if fpBind(FListenSocket, @sAddr, sizeof(sAddr)) <> -1 then begin
- { It seems the maximum connection value isn't enforced by the
- Free Pascal library, so this 512 is a constant, dummy value. }
- if fpListen(FListenSocket, 512) <> -1 then begin
- Result:= true;
- Start;
+ GAIResult:= ResolveHost(FListenAddress, FFamily);
+ if GAIResult.GAIError = 0 then begin
+ Move(GAIResult.AddrInfo^.ai_addr^, SockAddr, GAIResult.AddrInfo^.ai_addrlen);
+ SockAddr.sin6_port:= htons(FListenPort);
+
+ if fpBind(FListenSocket, @SockAddr, GAIResult.AddrInfo^.ai_addrlen) <> -1 then begin
+ { It seems the maximum connection value isn't enforced by the
+ Free Pascal library, so this 512 is a constant, dummy value. }
+ if fpListen(FListenSocket, 512) <> -1 then begin
+ Result:= true;
+ Start;
+ end
+ else Result:= false;
end
else Result:= false;
+
+ FreeHost(GAIResult);
end
- else Result:= false;
+ else Result:= false;
end
else Result:= false;
end;
{ Now, accept connections. }
AcceptFailCount:= 0;
while not Terminated do begin
- Len:= SizeOf(sAddr);
- ClientSocket:= fpAccept(FListenSocket, @sAddr, @Len);
+ Len:= SizeOf(SockAddr);
+ ClientSocket:= fpAccept(FListenSocket, @SockAddr, @Len);
if ClientSocket <> -1 then begin
AcceptFailCount:= 0;
connection. }
case FFeatureRequest of
NET_TCP_BASIC:
- TCPConnection:= TTCPConnection.Create(ClientSocket, sAddr);
+ TCPConnection:= TTCPConnection.Create(ClientSocket, SockAddr);
NET_TCP_RFCSUPPORT:
- TCPConnection:= TTCPRFCConnection.Create(ClientSocket, sAddr);
+ TCPConnection:= TTCPRFCConnection.Create(ClientSocket, SockAddr);
end;
{ Then start a new thread with the connection handler. }
projects / mgsmtp.git / blobdiff