[Nmailserver-commits] SF.net SVN: nmailserver: [76] NMail/branches/luke-dev/NMail

[<tmy...@us...>]

Revision: 76
          http://svn.sourceforge.net/nmailserver/?rev=76&view=rev
Author:   tmyroadctfig
Date:     2006-11-07 04:25:09 -0800 (Tue, 07 Nov 2006)

Log Message:
-----------
Fixed some defects.

Modified Paths:
--------------
    NMail/branches/luke-dev/NMail/IO/TcpTextConnection.cs
    NMail/branches/luke-dev/NMail.SmtpService/Command/DataCommand.cs
    NMail/branches/luke-dev/NMail.SmtpService/Command/ResetCommand.cs

Modified: NMail/branches/luke-dev/NMail/IO/TcpTextConnection.cs
===================================================================
--- NMail/branches/luke-dev/NMail/IO/TcpTextConnection.cs	2006-11-07 12:13:59 UTC (rev 75)
+++ NMail/branches/luke-dev/NMail/IO/TcpTextConnection.cs	2006-11-07 12:25:09 UTC (rev 76)
@@ -132,7 +132,11 @@
 				AddressFamily.InterNetwork,
 				SocketType.Stream,
 				ProtocolType.Tcp);
-			this.socket.Connect(new IPEndPoint(target.Address, (int) port));
+			if (target.Address != null) {
+				this.socket.Connect(new IPEndPoint(target.Address, port));
+			} else {
+				this.socket.Connect(target.Domain.ToString(), port);
+			}
 			this.networkStream = new NetworkStream(this.socket, FileAccess.ReadWrite, true);
 
 			this.readBuffer = string.Empty;

Modified: NMail/branches/luke-dev/NMail.SmtpService/Command/DataCommand.cs
===================================================================
--- NMail/branches/luke-dev/NMail.SmtpService/Command/DataCommand.cs	2006-11-07 12:13:59 UTC (rev 75)
+++ NMail/branches/luke-dev/NMail.SmtpService/Command/DataCommand.cs	2006-11-07 12:25:09 UTC (rev 76)
@@ -82,7 +82,7 @@
 							session.Connection.ErrorMessageTooLarge();
 
 							// All bets are off?
-							session.Message = null;
+							session.Message = new SmtpMessage();
 							session.CurrentState = new NegotiatedState(session);
 							return;
 						}

Modified: NMail/branches/luke-dev/NMail.SmtpService/Command/ResetCommand.cs
===================================================================
--- NMail/branches/luke-dev/NMail.SmtpService/Command/ResetCommand.cs	2006-11-07 12:13:59 UTC (rev 75)
+++ NMail/branches/luke-dev/NMail.SmtpService/Command/ResetCommand.cs	2006-11-07 12:25:09 UTC (rev 76)
@@ -18,6 +18,8 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+
+using NMail.DataTypes;
 using NMail.SmtpService.State;
 
 namespace NMail.SmtpService.Command {
@@ -51,7 +53,7 @@
 					session.CurrentState = new ConnectedState(session);
 				}
 
-				session.Message = null;
+				session.Message = new SmtpMessage();
 				session.Connection.Ok();
 			} else {
 				throw new ApplicationException("Invalid command syntax");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.