Added Encoding option to session settings

QuickFIXn/Fields/FieldBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 
 namespace QuickFix.Fields
 {
@@ -87,23 +88,23 @@ public override int GetHashCode()
         /// <summary>
         /// length of formatted field (including tag=val\001)
         /// </summary>
-        public override int getLength()
+        public override int getLength(Encoding encoding)
         {
             if (_changed)
                 makeStringFields();
-            return System.Text.Encoding.UTF8.GetByteCount(_stringField) + 1; // +1 for SOH
+            return encoding.GetByteCount(_stringField) + 1; // +1 for SOH
         }
 
         /// <summary>
         /// checksum
         /// </summary>
-        public override int getTotal()
+        public override int getTotal(Encoding encoding)
         {
             if (_changed)
                 makeStringFields();
 
             int sum = 0;
-            byte[] array = System.Text.Encoding.UTF8.GetBytes(_stringField);
+            byte[] array = encoding.GetBytes(_stringField);
             foreach (byte b in array)
             {
                 sum += b;

QuickFIXn/Fields/IField.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 
 namespace QuickFix.Fields
 {
@@ -24,11 +25,11 @@ public abstract class IField
         /// <summary>
         /// length of formatted field (including tag=val\001)
         /// </summary>
-        public abstract int getLength();
+        public abstract int getLength(Encoding encoding);
 
         /// <summary>
         /// checksum
         /// </summary>
-        public abstract int getTotal();
+        public abstract int getTotal(Encoding encoding);
     }
 }

QuickFIXn/FileStore.cs

@@ -31,6 +31,8 @@ public MsgDef(long index, int size)
         private System.IO.FileStream msgFile_;
         private System.IO.StreamWriter headerFile_;
 
+        private Encoding encoding_;
+
         private MemoryStore cache_ = new MemoryStore();
 
         System.Collections.Generic.Dictionary<int, MsgDef> offsets_ = new Dictionary<int, MsgDef>();
@@ -55,8 +57,10 @@ public static string Prefix(SessionID sessionID)
             return prefix.ToString();
         }
 
-        public FileStore(string path, SessionID sessionID)
+        public FileStore(SessionID sessionID, SessionSettings settings)
         {
+            string path = settings.Get(sessionID).GetString(SessionSettings.FILE_STORE_PATH);
+
             if (!System.IO.Directory.Exists(path))
                 System.IO.Directory.CreateDirectory(path);
 
@@ -67,6 +71,10 @@ public FileStore(string path, SessionID sessionID)
             headerFileName_ = System.IO.Path.Combine(path, prefix + ".header");
             sessionFileName_ = System.IO.Path.Combine(path, prefix + ".session");
 
+            encoding_ = settings.Get(sessionID).Has(SessionSettings.ENCODING)
+                ? Encoding.GetEncoding(settings.Get(sessionID).GetString(SessionSettings.ENCODING))
+                : SessionFactory.DefaultEncoding;
+
             open();
         }
 
@@ -183,7 +191,7 @@ public void Get(int startSeqNum, int endSeqNum, List<string> messages)
                     byte[] msgBytes = new byte[offsets_[i].size];
                     msgFile_.Read(msgBytes, 0, msgBytes.Length);
 
-                    messages.Add(Encoding.UTF8.GetString(msgBytes));
+                    messages.Add(encoding_.GetString(msgBytes));
                 }
             }
 
@@ -200,7 +208,7 @@ public bool Set(int msgSeqNum, string msg)
             msgFile_.Seek(0, System.IO.SeekOrigin.End);
 
             long offset = msgFile_.Position;
-            byte[] msgBytes = Encoding.UTF8.GetBytes(msg);
+            byte[] msgBytes = encoding_.GetBytes(msg);
             int size = msgBytes.Length;
 
             StringBuilder b = new StringBuilder();

QuickFIXn/FileStoreFactory.cs

@@ -26,7 +26,7 @@ public FileStoreFactory(SessionSettings settings)
         /// <returns></returns>
         public IMessageStore Create(SessionID sessionID)
         {
-            return new FileStore(settings_.Get(sessionID).GetString(SessionSettings.FILE_STORE_PATH), sessionID);
+            return new FileStore(sessionID, settings_);
         }
 
         #endregion

QuickFIXn/Message/FieldMap.cs

@@ -549,30 +549,30 @@ public bool IsEmpty()
             return ((_fields.Count == 0) && (_groups.Count == 0));
         }
 
-        public int CalculateTotal()
+        public int CalculateTotal(Encoding encoding)
         {
             int total = 0;
             foreach (Fields.IField field in _fields.Values)
             {
                 if (field.Tag != Fields.Tags.CheckSum)
-                    total += field.getTotal();
+                    total += field.getTotal(encoding);
             }
 
             foreach (Fields.IField field in this.RepeatedTags)
             {
                 if (field.Tag != Fields.Tags.CheckSum)
-                    total += field.getTotal();
+                    total += field.getTotal(encoding);
             }
 
             foreach (List<Group> groupList in _groups.Values)
             {
                 foreach (Group group in groupList)
-                    total += group.CalculateTotal();
+                    total += group.CalculateTotal(encoding);
             }
             return total;
         }
 
-        public int CalculateLength()
+        public int CalculateLength(Encoding encoding)
         {
             int total = 0;
             foreach (Fields.IField field in _fields.Values)
@@ -582,7 +582,7 @@ public int CalculateLength()
                     && field.Tag != Tags.BodyLength
                     && field.Tag != Tags.CheckSum)
                 {
-                    total += field.getLength();
+                    total += field.getLength(encoding);
                 }
             }
 
@@ -593,14 +593,14 @@ public int CalculateLength()
                     && field.Tag != Tags.BodyLength
                     && field.Tag != Tags.CheckSum)
                 {
-                    total += field.getLength();
+                    total += field.getLength(encoding);
                 }
             }
 
             foreach (List<Group> groupList in _groups.Values)
             {
                 foreach (Group group in groupList)
-                    total += group.CalculateLength();
+                    total += group.CalculateLength(encoding);
             }
 
             return total;

QuickFIXn/Message/Message.cs

@@ -49,7 +49,9 @@ public class Message : FieldMap
         public const string SOH = "\u0001";
         private int field_ = 0;
         private bool validStructure_;
-
+
+        public Encoding Encoding { get; set; }
+
         #region Properties
 
         public Header Header { get; private set; }
@@ -61,6 +63,7 @@ public class Message : FieldMap
 
         public Message()
         {
+            Encoding = SessionFactory.DefaultEncoding;
             this.Header = new Header();
             this.Trailer = new Trailer();
             this.validStructure_ = true;
@@ -93,6 +96,7 @@ public Message(string msgstr, DataDictionary.DataDictionary sessionDataDictionar
         public Message(Message src)
             : base(src)
         {
+            Encoding = src.Encoding;
             this.Header = new Header(src.Header);
             this.Trailer = new Trailer(src.Trailer);
             this.validStructure_ = src.validStructure_;
@@ -565,11 +569,11 @@ public void Validate()
             {
                 int receivedBodyLength = this.Header.GetInt(Tags.BodyLength);
                 if (BodyLength() != receivedBodyLength)
-                    throw new InvalidMessage("Expected BodyLength=" + BodyLength() + ", Received BodyLength=" + receivedBodyLength);
+                    throw new InvalidMessage("Expected BodyLength=" + BodyLength() + ", Received BodyLength=" + receivedBodyLength + ", Message.SeqNum=" + this.Header.GetInt(Tags.MsgSeqNum));
 
                 int receivedCheckSum = this.Trailer.GetInt(Tags.CheckSum);
                 if (CheckSum() != receivedCheckSum)
-                    throw new InvalidMessage("Expected CheckSum=" + CheckSum() + ", Received CheckSum=" + receivedCheckSum);
+                    throw new InvalidMessage("Expected CheckSum=" + CheckSum() + ", Received CheckSum=" + receivedCheckSum + ", Message.SeqNum=" + this.Header.GetInt(Tags.MsgSeqNum));
             }
             catch (FieldNotFoundException e)
             {
@@ -705,9 +709,9 @@ public void ReverseRoute(Header header)
         public int CheckSum()
         {
             return (
-                (this.Header.CalculateTotal()
-                + CalculateTotal()
-                + this.Trailer.CalculateTotal()) % 256);
+                (this.Header.CalculateTotal(Encoding)
+                + CalculateTotal(Encoding)
+                + this.Trailer.CalculateTotal(Encoding)) % 256);
         }
 
         public bool IsAdmin()
@@ -783,7 +787,7 @@ public override string ToString()
 
         protected int BodyLength()
         {
-            return this.Header.CalculateLength() + CalculateLength() + this.Trailer.CalculateLength();
+            return this.Header.CalculateLength(Encoding) + CalculateLength(Encoding) + this.Trailer.CalculateLength(Encoding);
         }
     }
 }

QuickFIXn/MessageBuilder.cs

@@ -19,6 +19,7 @@ internal class MessageBuilder
 
         private Message _message;
         private QuickFix.Fields.ApplVerID _defaultApplVerId;
+        private Encoding _encoding;
 
         public string OriginalString { get { return _msgStr; } }
         public QuickFix.Fields.MsgType MsgType { get { return _msgType; } }
@@ -34,14 +35,16 @@ internal MessageBuilder(
             bool validateLengthAndChecksum,
             DataDictionary.DataDictionary sessionDD,
             DataDictionary.DataDictionary appDD,
-            IMessageFactory msgFactory)
+            IMessageFactory msgFactory,
+            Encoding encoding)
         {
             _msgStr = msgStr;
             _defaultApplVerId = new ApplVerID(defaultApplVerId);
             _validateLengthAndChecksum = validateLengthAndChecksum;
             _sessionDD = sessionDD;
             _appDD = appDD;
             _msgFactory = msgFactory;
+            _encoding = encoding;
 
             _msgType = Message.IdentifyType(_msgStr);
             _beginString = Message.ExtractBeginString(_msgStr);
@@ -50,6 +53,7 @@ internal MessageBuilder(
         internal Message Build()
         {
             Message message = _msgFactory.Create(_beginString, _defaultApplVerId, _msgType.Obj);
+            message.Encoding = _encoding; //TODO: maybe add this to message constructor
             message.FromString(
                 _msgStr,
                 _validateLengthAndChecksum,
@@ -66,6 +70,7 @@ internal Message RejectableMessage()
                 return _message;
 
             Message message = _msgFactory.Create(_beginString, _msgType.Obj);
+            message.Encoding = _encoding;
             message.FromString(
                 _msgStr,
                 false,

QuickFIXn/Parser.cs

@@ -1,3 +1,7 @@
+
+
+using System.Text;
+
 namespace QuickFix
 {
     /// <summary>
@@ -6,6 +10,13 @@ public class Parser
     {
         private byte[] buffer_ = new byte[512];
         int usedBufferLength = 0;
+        private Encoding encoding_;
+
+        public Parser(Encoding encoding)
+        {
+            encoding_ = encoding;
+        }
+
         public void AddToStream(ref byte[] data, int bytesAdded)
         {
             if (buffer_.Length < usedBufferLength + bytesAdded)
@@ -16,9 +27,8 @@ public void AddToStream(ref byte[] data, int bytesAdded)
 
         public void AddToStream(string data)
         {
-            byte[] bytes = System.Text.Encoding.UTF8.GetBytes(data);
+            byte[] bytes = encoding_.GetBytes(data);
             AddToStream(ref bytes, bytes.Length);
-
         }
 
 
@@ -74,7 +84,7 @@ public bool ReadFixMessage(out string msg)
 
         public bool ExtractLength(out int length, out int pos, string buf)
         {
-            return ExtractLength(out length, out pos, System.Text.Encoding.UTF8.GetBytes(buf));
+            return ExtractLength(out length, out pos, encoding_.GetBytes(buf));
         }
 
         public bool ExtractLength(out int length, out int pos, byte[] buf)
@@ -118,7 +128,7 @@ private bool Fail(string what)
 
         private int IndexOf(byte[] arrayToSearchThrough, string stringPatternToFind, int offset)
         {
-            byte[] patternToFind = System.Text.Encoding.UTF8.GetBytes(stringPatternToFind);
+            byte[] patternToFind = encoding_.GetBytes(stringPatternToFind);
             if (patternToFind.Length > arrayToSearchThrough.Length)
                 return -1;
             for (int i = offset; i <= arrayToSearchThrough.Length - patternToFind.Length; i++)
@@ -151,7 +161,7 @@ private string Substring(byte[] array, int startIndex, int length)
         {
             byte[] returnByte = new byte[length];
             System.Buffer.BlockCopy(array, startIndex, returnByte, 0, length);
-            return System.Text.Encoding.UTF8.GetString(returnByte);
+            return encoding_.GetString(returnByte);
         }
     }
 }

QuickFIXn/Session.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text;
 using QuickFix.Fields;
 using QuickFix.Fields.Converters;
 
@@ -226,6 +227,7 @@ public TimeStampPrecision TimeStampPrecision
         public DataDictionaryProvider DataDictionaryProvider { get; set; }
         public DataDictionary.DataDictionary SessionDataDictionary { get; private set; }
         public DataDictionary.DataDictionary ApplicationDataDictionary { get; private set; }
+        public Encoding Encoding { get; set; }
 
         /// <summary>
         /// Returns whether the Session has a Responder. This method is synchronized
@@ -250,6 +252,7 @@ public Session(
             this.schedule_ = sessionSchedule;
             this.msgFactory_ = msgFactory;
             this.appDoesEarlyIntercept_ = app is IApplicationExt;
+            this.Encoding = SessionFactory.DefaultEncoding;
 
             this.SenderDefaultApplVerID = senderDefaultApplVerID;
 
@@ -558,7 +561,8 @@ private void NextMessage(string msgStr)
                     this.ValidateLengthAndChecksum,
                     this.SessionDataDictionary,
                     this.ApplicationDataDictionary,
-                    this.msgFactory_);
+                    this.msgFactory_,
+                    this.Encoding);
 
             Next(msgBuilder);
         }
@@ -1637,6 +1641,7 @@ protected bool SendRaw(Message message, int seqNum)
         {
             lock (sync_)
             {
+                message.Encoding = this.Encoding;
                 string msgType = message.Header.GetField(Fields.Tags.MsgType);
 
                 InitializeHeader(message, seqNum);