Update of /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source
In directory sc8-pr-cvs1:/tmp/cvs-serv18962
Modified Files:
TlsReader.cs TlsSession.cs TlsStreamWriter.cs
Log Message:
- Improved application data messages handling
- Non definitive change to readFully method
Index: TlsReader.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/TlsReader.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TlsReader.cs 14 Sep 2003 14:42:34 -0000 1.18
--- TlsReader.cs 15 Sep 2003 10:25:22 -0000 1.19
***************
*** 144,150 ****
byte b = base.ReadByte();
ms.WriteByte(b);
! while (session.NetworkStream.DataAvailable)
{
! ms.WriteByte(base.ReadByte());
}
--- 144,151 ----
byte b = base.ReadByte();
ms.WriteByte(b);
! while (session.Socket.Available != 0)
{
! byte[] buffer = base.ReadBytes(session.Socket.Available);
! ms.Write(buffer, 0, buffer.Length);
}
***************
*** 335,342 ****
}
- byte[] result = null;
-
TlsStreamReader buffer = new TlsStreamReader(this.readFully());
while (!buffer.EOF)
{
--- 336,342 ----
}
TlsStreamReader buffer = new TlsStreamReader(this.readFully());
+ TlsStreamWriter result = new TlsStreamWriter();
while (!buffer.EOF)
{
***************
*** 372,376 ****
case TlsContentType.Alert:
processAlert((TlsAlertLevel)message.ReadByte(),
! (TlsAlertDescription)message.ReadByte());
break;
--- 372,376 ----
case TlsContentType.Alert:
processAlert((TlsAlertLevel)message.ReadByte(),
! (TlsAlertDescription)message.ReadByte());
break;
***************
*** 381,387 ****
case TlsContentType.ApplicationData:
! result = message.GetBytes();
! #warning "Fix this"
! message.ReadBytes(message.GetBytes().Length);
break;
--- 381,385 ----
case TlsContentType.ApplicationData:
! result.Write(message.GetBytes());
break;
***************
*** 403,407 ****
}
! return result;
}
--- 401,405 ----
}
! return result.GetBytes();
}
***************
*** 409,414 ****
{
short val = base.ReadInt16();
-
-
return System.Net.IPAddress.HostToNetworkOrder(val);
--- 407,410 ----
Index: TlsSession.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/TlsSession.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TlsSession.cs 13 Sep 2003 11:09:56 -0000 1.15
--- TlsSession.cs 15 Sep 2003 10:25:22 -0000 1.16
***************
*** 100,103 ****
--- 100,108 ----
}
+ internal Socket Socket
+ {
+ get { return socket; }
+ }
+
#endregion
Index: TlsStreamWriter.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PgSqlClient.Security.Tls/source/TlsStreamWriter.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TlsStreamWriter.cs 12 Sep 2003 23:49:21 -0000 1.3
--- TlsStreamWriter.cs 15 Sep 2003 10:25:22 -0000 1.4
***************
*** 26,29 ****
--- 26,38 ----
internal class TlsStreamWriter : BinaryWriter
{
+ #region PROPERTIES
+
+ public long Length
+ {
+ get { return ((MemoryStream)BaseStream).Length; }
+ }
+
+ #endregion
+
#region CONSTRUCTORS
|
