From e0866921c3dd213b0e90088df16caf481de2c2b2 Mon Sep 17 00:00:00 2001 From: "e.knis" Date: Mon, 9 Oct 2017 15:33:58 +0700 Subject: [PATCH 1/4] Fix bug: Encoding.UTF8 caused Unhandled exception --- Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs index 07145ae..aff9bb7 100644 --- a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs +++ b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs @@ -11,7 +11,7 @@ namespace AsterNET.IO private TcpClient tcpClient; private NetworkStream networkStream; private StreamReader reader; - private StreamWriter writer; + private BinaryWriter writer; private Encoding encoding; private bool initial; @@ -29,8 +29,7 @@ namespace AsterNET.IO this.tcpClient = new TcpClient(host, port); this.networkStream = this.tcpClient.GetStream(); this.reader = new StreamReader(this.networkStream, encoding); - this.writer = new StreamWriter(this.networkStream, encoding); - this.writer.AutoFlush = true; + this.writer = new BinaryWriter(this.networkStream, encoding); } #endregion @@ -47,8 +46,7 @@ namespace AsterNET.IO this.tcpClient = tcpClient; this.networkStream = this.tcpClient.GetStream(); this.reader = new StreamReader(this.networkStream, encoding); - this.writer = new StreamWriter(this.networkStream, encoding); - this.writer.AutoFlush = true; + this.writer = new BinaryWriter(this.networkStream, encoding); } #endregion @@ -156,7 +154,8 @@ namespace AsterNET.IO /// connection has already been closed. public void Write(string s) { - writer.Write(s); + writer.Write(encoding.GetBytes(s)); + writer.Flush(); } #endregion From 8c306897872555e5201ff51bb65d02461bcebf40 Mon Sep 17 00:00:00 2001 From: "e.knis" Date: Wed, 18 Oct 2017 16:35:48 +0700 Subject: [PATCH 2/4] CR Fix --- Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs index aff9bb7..8d73dd1 100644 --- a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs +++ b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs @@ -155,7 +155,7 @@ namespace AsterNET.IO public void Write(string s) { writer.Write(encoding.GetBytes(s)); - writer.Flush(); + writer.Flush(); } #endregion From 16734c8bf2904eef106434a666237d6dd15dc84f Mon Sep 17 00:00:00 2001 From: "e.knis" Date: Wed, 18 Oct 2017 16:38:53 +0700 Subject: [PATCH 3/4] One more CR Fix --- Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs index 8d73dd1..1621d57 100644 --- a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs +++ b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs @@ -154,8 +154,8 @@ namespace AsterNET.IO /// connection has already been closed. public void Write(string s) { - writer.Write(encoding.GetBytes(s)); - writer.Flush(); + writer.Write(encoding.GetBytes(s)); + writer.Flush(); } #endregion From fb3b54eb0f5ffd49619f0772971367e669a69e62 Mon Sep 17 00:00:00 2001 From: "e.knis" Date: Wed, 18 Oct 2017 16:48:02 +0700 Subject: [PATCH 4/4] One more CR fix --- Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs index 1621d57..5df2484 100644 --- a/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs +++ b/Asterisk.2013/Asterisk.NET/IO/SocketConnection.cs @@ -154,8 +154,8 @@ namespace AsterNET.IO /// connection has already been closed. public void Write(string s) { - writer.Write(encoding.GetBytes(s)); - writer.Flush(); + writer.Write(encoding.GetBytes(s)); + writer.Flush(); } #endregion