We don't need these interfaces anymore. We can send message without these interfaces when defined as abstract. (reverse-merged from commit 5d71efb)

Author: Pang Wu

MSNPSharp/Core/IMessageHandler.cs

@@ -0,0 +1,54 @@
+#region
+/*
+Copyright (c) 2002-2012, Bas Geertsema, Xih Solutions
+(http://www.xihsolutions.net), Thiago.Sayao, Pang Wu, Ethem Evlice, Andy Phan, Chang Liu. 
+All rights reserved. http://code.google.com/p/msnp-sharp/
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the names of Bas Geertsema or Xih Solutions nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE. 
+*/
+#endregion
+
+using System;
+
+namespace MSNPSharp.Core
+{
+    /// <summary>
+    /// IMessageHandler defines the methods required to handle incoming network messages.
+    /// </summary>
+    public interface IMessageHandler
+    {
+        /// <summary>
+        /// Gets or sets the processor of network messages. 
+        /// Every message handler is associated with a single message processor.
+        /// This way the handler can initiate, or send, messages which are not a reply
+        /// on incoming messages.
+        /// </summary>
+        IMessageProcessor MessageProcessor
+        {
+            get;
+            set;
+        }
+    }
+};

MSNPSharp/Core/MessageProcessor.cs

@@ -0,0 +1,56 @@
+#region
+/*
+Copyright (c) 2002-2012, Bas Geertsema, Xih Solutions
+(http://www.xihsolutions.net), Thiago.Sayao, Pang Wu, Ethem Evlice, Andy Phan, Chang Liu. 
+All rights reserved. http://code.google.com/p/msnp-sharp/
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the names of Bas Geertsema or Xih Solutions nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE. 
+*/
+#endregion
+
+using System;
+
+namespace MSNPSharp.Core
+{
+    using MSNPSharp;
+
+    /// <summary>
+    /// Defines methods to send network messages.
+    /// </summary>
+    /// <remarks>
+    /// IMessageProcessor is the abstraction of an object which can send network messages.
+    /// Network messages can be any kind of messages: text messages, data messages.
+    /// By using this interface a de-coupling is established between the handling of messages
+    /// and the I/O of messages.
+    /// </remarks>
+    public interface IMessageProcessor
+    {
+        /// <summary>
+        /// Sends a message to be processed by the processor.
+        /// </summary>
+        /// <param name="message"></param>
+        void SendMessage(NetworkMessage message);
+    }
+};

MSNPSharp/Core/SocketMessageProcessor.cs

@@ -81,7 +81,7 @@ public byte[] Bytes
     };
 
 
-    public abstract class SocketMessageProcessor : IDisposable
+    public abstract class SocketMessageProcessor : IMessageProcessor, IDisposable
     {
         #region Events
 

MSNPSharp/MSNPSharp.csproj

@@ -94,6 +94,7 @@
       <DependentUpon>enums.cs</DependentUpon>
     </Compile>
     <Compile Include="EventArgs.cs" />
+    <Compile Include="Core\IMessageHandler.cs" />
     <Compile Include="Framework.cs" />
     <Compile Include="IO\DeltasList.cs" />
     <Compile Include="IO\IO.cs" />
@@ -103,6 +104,7 @@
     <Compile Include="IO\SerializableMemoryStream.cs" />
     <Compile Include="MailEventArgs.cs" />
     <Compile Include="Core\MessagePool.cs" />
+    <Compile Include="Core\MessageProcessor.cs" />
     <Compile Include="MessageManager.cs" />
     <Compile Include="Messenger.cs" />
     <Compile Include="Core\MSNMessage.cs" />

MSNPSharp/Messenger.cs

@@ -146,7 +146,7 @@ public ConnectivitySettings ConnectivitySettings
             {
                 connectivitySettings = value;
 
-                NSMessageProcessor mp = Nameserver.MessageProcessor;
+                NSMessageProcessor mp = Nameserver.MessageProcessor as NSMessageProcessor;
 
                 if (mp != null)
                 {
@@ -195,7 +195,7 @@ public bool Connected
         {
             get
             {
-                NSMessageProcessor mp = Nameserver.MessageProcessor;
+                NSMessageProcessor mp = Nameserver.MessageProcessor as NSMessageProcessor;
                 return (mp != null && mp.Connected);
             }
         }
@@ -368,7 +368,7 @@ private void DoConnect()
         /// </summary>
         public virtual void Disconnect()
         {
-            NSMessageProcessor mp = Nameserver.MessageProcessor;
+            NSMessageProcessor mp = Nameserver.MessageProcessor as NSMessageProcessor;
 
             if (mp != null && mp.Connected)
             {

MSNPSharp/NSMessageHandler.MSNP21.cs

@@ -275,7 +275,7 @@ public int CreateMultiparty(List<Contact> inviteQueue, EventHandler<MultipartyCr
                 throw new InvalidOperationException("At least 2 contacts is required except you and contacts must support multiparty.");
 
 
-            NSMessageProcessor nsmp = MessageProcessor;
+            NSMessageProcessor nsmp = (NSMessageProcessor)MessageProcessor;
             int transId = nsmp.IncreaseTransactionID();
 
             lock (multiParties)
@@ -1274,7 +1274,7 @@ private void OnNFYPUTReceived(MultiMimeMessage multiMimeMessage, RoutingInfo rou
                             if (mpo == null)
                             {
                                 // Created remotely.
-                                NSMessageProcessor nsmp = MessageProcessor;
+                                NSMessageProcessor nsmp = (NSMessageProcessor)MessageProcessor;
                                 int transId = nsmp.IncreaseTransactionID();
 
                                 group = new Contact(routingInfo.SenderAccount, IMAddressInfoType.TemporaryGroup, this);

MSNPSharp/NSMessageHandler.cs

@@ -55,7 +55,7 @@ namespace MSNPSharp
     /// Handles the protocol messages from the notification server
     /// and implements protocol version MSNP21.
     /// </summary>
-    public partial class NSMessageHandler
+    public partial class NSMessageHandler : IMessageHandler
     {
         /// <summary>
         /// Machine Guid
@@ -403,7 +403,7 @@ public ConnectivitySettings ConnectivitySettings
         {
             get
             {
-                return MessageProcessor.ConnectivitySettings;
+                return (MessageProcessor as NSMessageProcessor).ConnectivitySettings;
             }
         }
 
@@ -459,7 +459,7 @@ internal Owner Owner
         /// <summary>
         /// The processor to handle the messages
         /// </summary>
-        public NSMessageProcessor MessageProcessor
+        public IMessageProcessor MessageProcessor
         {
             get
             {
@@ -635,7 +635,7 @@ protected virtual void OnProcessorConnectCallback(object sender, EventArgs e)
         /// </summary>
         protected virtual void SendInitialMessage()
         {
-            MessageProcessor.ResetTransactionID();
+            (MessageProcessor as NSMessageProcessor).ResetTransactionID();
 
             // 1) VER: MSN Protocol used
             MessageProcessor.SendMessage(new NSMessage("VER", new string[] { "MSNP21", "CVR0" }));
@@ -902,7 +902,7 @@ protected virtual void OnXFRReceived(NSMessage message)
             if ((string)message.CommandValues[0] == "NS")
             {
                 // switch to a new notification server. That means reconnecting our current message processor.
-                NSMessageProcessor processor = MessageProcessor;
+                NSMessageProcessor processor = (NSMessageProcessor)MessageProcessor;
                 // set new connectivity settings
                 ConnectivitySettings newSettings = new ConnectivitySettings(processor.ConnectivitySettings);
                 // disconnect first
@@ -1364,7 +1364,7 @@ internal void SetDefaults()
 
         private void SendInitialServiceADL()
         {
-            NSMessageProcessor nsmp = MessageProcessor;
+            NSMessageProcessor nsmp = MessageProcessor as NSMessageProcessor;
 
             if (nsmp == null)
                 return;
@@ -1397,7 +1397,7 @@ internal void SendInitialADL(Scenario scene)
             if (scene == Scenario.None)
                 return;
 
-            NSMessageProcessor nsmp = MessageProcessor;
+            NSMessageProcessor nsmp = (NSMessageProcessor)MessageProcessor;
 
             if (nsmp == null)
                 return;

MSNPSharp/NSMessageProcessor.cs

@@ -58,7 +58,7 @@ public NSMessage NSMessage
         }
     };
 
-    public class NSMessageProcessor
+    public class NSMessageProcessor : IMessageProcessor
     {
         #region Events
 

MSNPSharp/P2P/P2PDirectProcessor.cs

@@ -55,7 +55,7 @@ public enum DirectConnectionState
     /// <summary>
     /// Handles the direct connections in P2P sessions.
     /// </summary>
-    public class P2PDirectProcessor : IDisposable
+    public class P2PDirectProcessor : IMessageProcessor, IDisposable
     {
         #region Events
 

MSNPSharp/P2P/SDGBridge.cs

@@ -185,7 +185,7 @@ protected override void SendOnePacket(P2PSession session, Contact remote, Guid r
                 mmMessage.InnerMessage = p2pMessage;
             }
 
-            NSMessageProcessor nsmp = NSMessageHandler.MessageProcessor;
+            NSMessageProcessor nsmp = (NSMessageProcessor)NSMessageHandler.MessageProcessor;
             int transId = nsmp.IncreaseTransactionID();
 
             lock (p2pAckMessages)
@@ -202,7 +202,7 @@ protected override void SendMultiPacket(P2PSession session, Contact remote, Guid
             if (remote == null)
                 return;
 
-            NSMessageProcessor nsmp = NSMessageHandler.MessageProcessor;
+            NSMessageProcessor nsmp = (NSMessageProcessor)NSMessageHandler.MessageProcessor;
 
             string to = ((int)remote.ClientType).ToString() + ":" + remote.Account;
             string from = ((int)NSMessageHandler.Owner.ClientType).ToString() + ":" + NSMessageHandler.Owner.Account;