Bind to user-specified address (BindAddress)

[mgsmtp.git] / Relay.pas

diff --git a/Relay.pas b/Relay.pas
index 713db8d8641af8593d6703d4a9999bd6c548efd1..3df2b330ca14ec3d79d61d5200980f7f74597ded 100644 (file)
--- a/Relay.pas
+++ b/Relay.pas
@@ -1,6 +1,6 @@
 {
    MegaBrutal's SMTP Server (MgSMTP)
-   Copyright (C) 2010-2015 MegaBrutal
+   Copyright (C) 2010-2018 MegaBrutal
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
@@ -331,7 +331,9 @@ var MXList: TStrings; i: integer;
 begin
    MXList:= GetCorrectMXRecordList(RelayServerName);
    if MXList.Count >= 1 then begin
-      TCP:= TTCPRFCConnection.Create(MXList.Strings[0], RelayServerPort);
+      TCP:= TTCPRFCConnection.Create;
+      TCP.SetBindAddress(MainServerConfig.BindAddress);
+      TCP.Connect(MXList.Strings[0], RelayServerPort);
       TCP.SetSockTimeOut(DEF_SOCK_TIMEOUT);
       i:= 1;
       while (not TCP.Connected) and (i < MXList.Count) do begin
@@ -441,7 +443,7 @@ var
    procedure ProcessRCPTResponse;
    begin
       TCP.ReadResponse(Response);
-      { If we get an "OK" reply code, we increase the count of sucessful
+      { If we get an "OK" reply code, we increase the count of successful
         recipients. }
       if Response.GetNumericCode = SMTP_R_OK then Inc(c)
       { Response code 0 is non-existent in the SMTP protocol.