Merge branch 'master' of https://github.com/Azure/amqpnetlite into re…

…lease-1.0

build.cmd

@@ -36,6 +36,10 @@ IF /I "%1" EQU "clean" (
   GOTO :args-done
 )
 
+IF /I "%1" EQU "test" (
+  GOTO :build-done
+)
+
 :args-start
 IF /I "%1" EQU "" GOTO args-done
 

dnx/Amqp.DotNet/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.5",
+  "version": "1.1.7",
   "description": "Amqp 1.0 Class Library for .NETFramework, .NETPlatform, and WinRT",
   "authors": [ "xinchen" ],
   "tags": [ "AMQP Micro-Framework netmf netcf iot winrt coreclr corefx .NetPlatform .NetCore UWP" ],

src/Connection.cs

@@ -59,6 +59,7 @@ enum State
 
         internal const uint DefaultMaxFrameSize = 256 * 1024;
         internal const ushort DefaultMaxSessions = 256;
+        internal const int DefaultMaxLinksPerSession = 64;
         const uint MaxIdleTimeout = 30 * 60 * 1000;
         static readonly TimerCallback onHeartBeatTimer = OnHeartBeatTimer;
         readonly Address address;
@@ -133,9 +134,9 @@ internal Connection(IBufferManager bufferManager, AmqpSettings amqpSettings, Add
             : this((ushort)(amqpSettings.MaxSessionsPerConnection - 1), (uint)amqpSettings.MaxFrameSize)
         {
             this.BufferManager = bufferManager;
+            this.MaxLinksPerSession = amqpSettings.MaxLinksPerSession;
             this.address = address;
             this.onOpened = onOpened;
-            this.maxFrameSize = (uint)amqpSettings.MaxFrameSize;
             this.transport = transport;
             transport.SetConnection(this);
 
@@ -170,6 +171,8 @@ internal IBufferManager BufferManager
             private set;
         }
 
+        internal int MaxLinksPerSession;
+
         ByteBuffer AllocateBuffer(int size)
         {
             return this.BufferManager.GetByteBuffer(size);
@@ -180,6 +183,8 @@ ByteBuffer WrapBuffer(ByteBuffer buffer, int offset, int length)
             return new WrappedByteBuffer(buffer, offset, length);
         }
 #else
+        internal int MaxLinksPerSession = DefaultMaxLinksPerSession;
+
         ByteBuffer AllocateBuffer(int size)
         {
             return new ByteBuffer(size, true);

src/Framing/AmqpValue.cs

@@ -92,6 +92,7 @@ internal T GetValue<T>()
             }
             else
             {
+                this.valueBuffer.Seek(0);
                 return Serialization.AmqpSerializer.Deserialize<T>(this.valueBuffer);
             }
         }

src/Framing/Begin.cs

@@ -19,61 +19,94 @@ namespace Amqp.Framing
 {
     using Amqp.Types;
 
-    sealed class Begin : DescribedList
+    /// <summary>
+    /// The Begin class contains parameters to begin a session in a connection.
+    /// </summary>
+    public sealed class Begin : DescribedList
     {
+        /// <summary>
+        /// Initializes a Begin object.
+        /// </summary>
         public Begin()
             : base(Codec.Begin, 8)
         {
         }
 
+        /// <summary>
+        /// Gets or sets the remote-channel field.
+        /// </summary>
         public ushort RemoteChannel
         {
             get { return this.Fields[0] == null ? ushort.MaxValue : (ushort)this.Fields[0]; }
             set { this.Fields[0] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the next-outgoing-id field.
+        /// </summary>
         public uint NextOutgoingId
         {
             get { return this.Fields[1] == null ? uint.MinValue : (uint)this.Fields[1]; }
             set { this.Fields[1] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the incoming-window field.
+        /// </summary>
         public uint IncomingWindow
         {
             get { return this.Fields[2] == null ? uint.MaxValue : (uint)this.Fields[2]; }
             set { this.Fields[2] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the outgoing-window field.
+        /// </summary>
         public uint OutgoingWindow
         {
             get { return this.Fields[3] == null ? uint.MaxValue : (uint)this.Fields[3]; }
             set { this.Fields[3] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the handle-max field.
+        /// </summary>
         public uint HandleMax
         {
             get { return this.Fields[4] == null ? uint.MaxValue : (uint)this.Fields[4]; }
             set { this.Fields[4] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the offered-capabilities field.
+        /// </summary>
         public Symbol[] OfferedCapabilities
         {
             get { return Codec.GetSymbolMultiple(this.Fields, 5); }
             set { this.Fields[5] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the desired-capabilities field.
+        /// </summary>
         public Symbol[] DesiredCapabilities
         {
             get { return Codec.GetSymbolMultiple(this.Fields, 6); }
             set { this.Fields[6] = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the properties field.
+        /// </summary>
         public Fields Properties
         {
             get { return Amqp.Types.Fields.From(this.Fields, 7); }
             set { this.Fields[7] = value; }
         }
 
+        /// <summary>
+        /// Returns a string that represents the current begin object.
+        /// </summary>
         public override string ToString()
         {
 #if TRACE

src/Listener/ContainerHost.cs

@@ -243,6 +243,10 @@ bool IContainer.AttachLink(ListenerConnection connection, ListenerSession sessio
             }
 
             string address = attach.Role ? ((Source)attach.Source).Address : ((Target)attach.Target).Address;
+            if (string.IsNullOrWhiteSpace(address))
+            {
+                throw new AmqpException(ErrorCode.InvalidField, "The address field cannot be empty");
+            }
 
             MessageProcessor messageProcessor;
             if (TryGetProcessor(this.messageProcessors, address, out messageProcessor))

src/Listener/ListenerConnection.cs

@@ -17,6 +17,7 @@
 
 namespace Amqp.Listener
 {
+    using System;
     using System.Threading;
     using Amqp.Framing;
 
@@ -48,8 +49,21 @@ internal string RemoteContainerId
         internal override void OnBegin(ushort remoteChannel, Begin begin)
         {
             // this sends a begin to the remote peer
-            begin.RemoteChannel = remoteChannel;
-            var session = new ListenerSession(this, begin);
+            Begin local = new Begin()
+            {
+                RemoteChannel = remoteChannel,
+                IncomingWindow = Session.defaultWindowSize,
+                OutgoingWindow = begin.IncomingWindow,
+                NextOutgoingId = 0,
+                HandleMax = (uint)(this.listener.AMQP.MaxLinksPerSession - 1)
+            };
+
+            if (begin.HandleMax < local.HandleMax)
+            {
+                local.HandleMax = begin.HandleMax;
+            }
+
+            var session = new ListenerSession(this, local);
 
             // this updates the local session state
             begin.RemoteChannel = session.Channel;

src/Listener/ListenerSession.cs

@@ -27,7 +27,7 @@ namespace Amqp.Listener
     public class ListenerSession : Session
     {
         internal ListenerSession(ListenerConnection connection, Begin begin)
-            : base(connection, begin)
+            : base(connection, begin, null)
         {
         }
 

src/Message.cs

@@ -108,7 +108,7 @@ public object Body
             }
         }
 
-#if (NETFX || DOTNET || NETFX35)
+#if (NETFX || DOTNET || NETFX35 || NETFX40)
         /// <summary>
         /// Gets an object of type T from the message body.
         /// </summary>

src/Net/AmqpSettings.cs

@@ -50,14 +50,23 @@ public string HostName
         }
 
         /// <summary>
-        /// Gets or sets the open.channel-max field.
+        /// Gets or sets the open.channel-max field (less by one).
         /// </summary>
         public ushort MaxSessionsPerConnection
         {
             get;
             set;
         }
 
+        /// <summary>
+        /// Gets or sets the begin.handle-max field (less by one).
+        /// </summary>
+        public int MaxLinksPerSession
+        {
+            get;
+            set;
+        }
+
         /// <summary>
         /// Gets or sets the open.idle-time-out field.
         /// </summary>

src/Net/ConnectionFactoryBase.cs

@@ -41,9 +41,10 @@ protected ConnectionFactoryBase()
             this.amqpSettings = new AmqpSettings()
             {
                 MaxFrameSize = (int)Connection.DefaultMaxFrameSize,
-                ContainerId = "AMQPLite-" + Guid.NewGuid().ToString("N"),
+                ContainerId = "AMQPNetLite-" + Guid.NewGuid().ToString("N").Substring(0, 8),
                 IdleTimeout = int.MaxValue,
-                MaxSessionsPerConnection = 8
+                MaxSessionsPerConnection = Connection.DefaultMaxSessions,
+                MaxLinksPerSession = Connection.DefaultMaxLinksPerSession
             };
         }
 

src/Net/TypeExtensions.cs

@@ -40,6 +40,11 @@ internal static bool IsValueType(this Type type)
             return type.IsValueType;
         }
 
+        internal static bool IsEnum(this Type type)
+        {
+            return type.IsEnum;
+        }
+
         internal static bool IsGenericType(this Type type)
         {
             return type.IsGenericType;
@@ -81,6 +86,11 @@ internal static bool IsValueType(this Type type)
             return type.GetTypeInfo().IsValueType;
         }
 
+        internal static bool IsEnum(this Type type)
+        {
+            return type.GetTypeInfo().IsEnum;
+        }
+
         internal static bool IsGenericType(this Type type)
         {
             return type.GetTypeInfo().IsGenericType;

src/Properties/Version.cs

@@ -24,5 +24,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.1.6")]
-[assembly: AssemblyFileVersion("1.1.6")]
+[assembly: AssemblyVersion("1.1.7")]
+[assembly: AssemblyFileVersion("1.1.7")]

src/SenderLink.cs

@@ -287,11 +287,20 @@ void WriteDelivery(Delivery delivery)
             while (delivery != null)
             {
                 delivery.Handle = this.Handle;
-                bool settled = delivery.Settled;
-                this.Session.SendDelivery(delivery);
-                if (settled && delivery.OnOutcome != null)
+
+                try
+                {
+                    bool settled = delivery.Settled;
+                    this.Session.SendDelivery(delivery);
+                    if (settled && delivery.OnOutcome != null)
+                    {
+                        delivery.OnOutcome(delivery.Message, new Accepted(), delivery.UserToken);
+                    }
+                }
+                catch
                 {
-                    delivery.OnOutcome(delivery.Message, new Accepted(), delivery.UserToken);
+                    this.writing = false;
+                    throw;
                 }
 
                 lock (this.ThisLock)

src/Serialization/AmqpSerializer.cs

@@ -341,20 +341,34 @@ SerializableType CompileNonContractTypes(Type type)
                 return SerializableType.CreateObjectType(type);
             }
 
+            if (typeof(Described).IsAssignableFrom(type))
+            {
+                return SerializableType.CreateObjectType(type);
+            }
+
             if (typeof(IAmqpSerializable).IsAssignableFrom(type))
             {
                 return SerializableType.CreateAmqpSerializableType(this, type);
             }
 
-            if (typeof(Described).IsAssignableFrom(type))
+            if (type.IsGenericType() && type.GetGenericTypeDefinition() == typeof(Nullable<>))
             {
-                return SerializableType.CreateAmqpDescribedType(this, type);
+                Type[] argTypes = type.GetGenericArguments();
+                Fx.Assert(argTypes.Length == 1, "Nullable type must have one argument");
+                Type argType = argTypes[0];
+                if (argType.IsEnum())
+                {
+                    return CompileEnumType(argType);
+                }
+                else
+                {
+                    return SerializableType.CreateObjectType(type);
+                }
             }
 
-            SerializableType nullable = this.CompileNullableTypes(type);
-            if (nullable != null)
+            if (type.IsEnum())
             {
-                return nullable;
+                return CompileEnumType(type);
             }
 
             SerializableType collection = this.CompileCollectionTypes(type);
@@ -366,17 +380,10 @@ SerializableType CompileNonContractTypes(Type type)
             return null;
         }
 
-        SerializableType CompileNullableTypes(Type type)
+        SerializableType CompileEnumType(Type type)
         {
-            if (type.IsGenericType() &&
-                type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                Type[] argTypes = type.GetGenericArguments();
-                Fx.Assert(argTypes.Length == 1, "Nullable type must have one argument");
-                return SerializableType.CreateNullableType(type, this.GetType(argTypes[0]));
-            }
-
-            return null;
+            SerializableType underlyingType = GetType(Enum.GetUnderlyingType(type));
+            return SerializableType.CreateEnumType(type, underlyingType);
         }
 
         SerializableType CompileCollectionTypes(Type type)