{
- Copyright (C) 2010-2015 MegaBrutal
+ Copyright (C) 2010-2018 MegaBrutal
This unit is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
{FTimeCorrection: integer;}
FTimeOffset: integer;
FTimeOffsetStr: string;
- FListenPorts: TStrings;
+ FListenAddresses: TStrings;
public
function GetVersionStr: string;
- property ListenPorts: TStrings read FListenPorts;
+ property ListenAddresses: TStrings read FListenAddresses;
property Databytes: longint read FDatabytes;
{property TimeCorrection: integer read FTimeCorrection;}
property TimeOffset: integer read FTimeOffset;
procedure AddRecipient(Recipient: TRecipient); overload;
procedure SetReturnPath(Address: string);
procedure SetRecipientData(Index, Data: integer; RMsg: string = '');
+ procedure SetAllRecipientData(Data: integer; RMsg: string = '');
procedure SetRelayHost(HostName: string);
property ReturnPath: string read FReturnPath write SetReturnPath;
property RelayHost: string read FRelayHost write SetRelayHost;
function EMailTimeStamp(DateTime: TDateTime): string;
function EMailTimeStampCorrected(DateTime: TDateTime): string;
function StatusToStr(Status: integer): string;
- procedure AssignDeliveryStatusToSMTPCodes(Envelope: TEnvelope);
+ procedure AssignDeliveryStatusToSMTPCodes(Envelope: TEnvelope; TransactionComplete: boolean);
function CleanEOLN(S: string): string;
function GenerateRandomString(Length: integer): string;
+ '+' + IntToStr(Status and DS_SMTPREPLYMASK);
end;
-procedure AssignDeliveryStatusToSMTPCodes(Envelope: TEnvelope);
+procedure AssignDeliveryStatusToSMTPCodes(Envelope: TEnvelope; TransactionComplete: boolean);
var i, code, cond, status: integer; Recipient: TRecipient;
begin
for i:= 0 to Envelope.GetNumberOfRecipients - 1 do begin
cond:= code div 100;
case cond of
0: status:= DS_DELAYED or DS_UNEXPECTEDFAIL;
- 2: status:= DS_DELIVERED;
+ 2: if TransactionComplete then status:= DS_DELIVERED
+ else status:= DS_DELAYED or DS_UNEXPECTEDFAIL;
4: status:= DS_DELAYED;
5: status:= DS_PERMANENT;
else status:= DS_PERMANENT or DS_UNEXPECTEDFAIL;
end;
constructor TMainServerConfig.Create(Config: TINIFile);
+var i: integer; rawaddresslist: string; portlist: TStringList;
begin
inherited Create(Config.ReadString('Server', 'Name', ''), Config, 'Server');
- FListenPorts:= TStringList.Create;
- FListenPorts.Delimiter:= ',';
- FListenPorts.DelimitedText:= Config.ReadString('Server', 'ListenPort', '25');
+ FListenAddresses:= TStringList.Create;
+ FListenAddresses.Delimiter:= ',';
+
+ rawaddresslist:= Config.ReadString('Server', 'ListenAddress', '');
+ if rawaddresslist <> '' then
+ FListenAddresses.DelimitedText:= rawaddresslist
+ else begin
+ portlist:= TStringList.Create;
+ portlist.Delimiter:= ',';
+ portlist.DelimitedText:= Config.ReadString('Server', 'ListenPort', '25');
+ for i:= 0 to portlist.Count - 1 do
+ FListenAddresses.Add('0.0.0.0:' + portlist.Strings[i]);
+ portlist.Free;
+ end;
FDatabytes:= Config.ReadInteger('Server', 'Databytes', 1024 * 1024 * 1024);
- {FTimeCorrection:= Config.ReadInteger('Server', 'TimeCorrection', 0);}
FTimeOffset:= Config.ReadInteger('Server', 'TimeOffset', Config.ReadInteger('Server', 'TimeCorrection', 0) * 100);
FTimeOffsetStr:= MakeTimeOffsetStr(FTimeOffset);
FRecipients[Index].Data:= Data;
end;
+procedure TEnvelope.SetAllRecipientData(Data: integer; RMsg: string = '');
+var i: integer;
+begin
+ for i:= 0 to Length(FRecipients) - 1 do
+ SetRecipientData(i, Data, RMsg);
+end;
+
procedure TEnvelope.SetReturnPath(Address: string);
begin
FReturnPath:= Address;