Enable IPv6 listen address (ListenAddress6)

[mgsmtp.git] / Listener.pas

diff --git a/Listener.pas b/Listener.pas
index fc92edd86a77c31ac0a808354e03fc3710940c71..bff8dcf0ce9429d9ffb130433a0410cec9cf5ae2 100644 (file)
--- a/Listener.pas
+++ b/Listener.pas
@@ -38,7 +38,7 @@ uses SysUtils, Classes, Base64, Network, NetRFC, RFCSMTP,
 type
 
    TMgSMTPListener = class(TTCPListener)
-      constructor Create(const Address: string; Port: word);
+      constructor Create(const Address: string; Port, Family: word);
    protected
       procedure HandleClient(Connection: TTCPConnection); override;
       procedure ReceiveEMailData(TCP: TTCPRFCConnection; Response: TRFCReply; SpoolObject: TSpoolObjectCreator);
@@ -57,14 +57,20 @@ var
 
 
 procedure StartListeners;
-var i: integer; address, port: string;
+var i, j: integer; address, port: string; nport: word;
 begin
-   SetLength(MgSMTPListeners, MainServerConfig.ListenAddresses.Count);
-   for i:= 0 to Length(MgSMTPListeners) - 1 do begin
+   SetLength(MgSMTPListeners, MainServerConfig.ListenAddresses.Count + MainServerConfig.ListenAddresses6.Count);
+   for i:= 0 to MainServerConfig.ListenAddresses.Count - 1 do begin
       SplitParameters(MainServerConfig.ListenAddresses.Strings[i], address, port, ':');
-      MgSMTPListeners[i]:= TMgSMTPListener.Create(address, StrToIntDef(port, STANDARD_SMTP_PORT));
+      MgSMTPListeners[i]:= TMgSMTPListener.Create(address, StrToIntDef(port, STANDARD_SMTP_PORT), AF_INET);
       MgSMTPListeners[i].StartListen;
    end;
+   j:= MainServerConfig.ListenAddresses.Count;
+   for i:= 0 to MainServerConfig.ListenAddresses6.Count - 1 do begin
+      ParseIPv6Address(MainServerConfig.ListenAddresses6.Strings[i], address, nport);
+      MgSMTPListeners[j+i]:= TMgSMTPListener.Create(address, nport, AF_INET6);
+      MgSMTPListeners[j+i].StartListen;
+   end;
 end;
 
 procedure StopListeners;
@@ -128,10 +134,10 @@ begin
 end;
 
 
-constructor TMgSMTPListener.Create(const Address: string; Port: word);
+constructor TMgSMTPListener.Create(const Address: string; Port, Family: word);
 begin
    { Request connection objects with support for RFC-style commands & responses. }
-   inherited Create(Address, Port, NET_TCP_RFCSUPPORT);
+   inherited Create(Address, Port, Family, NET_TCP_RFCSUPPORT);
    Logger.AddLine('Server', 'Listening on address: ' + Address + ':' + IntToStr(Port));
 end;