sochix/TLSharp
1
0
Fork 0
mirror of https://github.com/sochix/TLSharp.git synced 2026-04-06 06:55:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

style: more consistent naming removing underscores

Browse source 
There were less places with underscores in field names than
places without them, so we now are consistent with the most
abundant occurrence.
This commit is contained in:
Andres G. Aragoneses 2020-01-31 14:39:19 +08:00
parent c031fa4f6d
commit 90f9305dd6
8 changed files with 96 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TLSharp.Core/Network/MtProtoPlainSender.cs
View file

@ -10,11 +10,11 @@ namespace TLSharp.Core.Network
private int timeOffset;
private long lastMessageId;
private Random random;
private TcpTransport _transport;
private TcpTransport transport;
public MtProtoPlainSender(TcpTransport transport)
{
_transport = transport;
this.transport = transport;
random = new Random();
}
@ -33,7 +33,7 @@ namespace TLSharp.Core.Network
byte[] packet = memoryStream.ToArray();
await _transport.Send(packet, token).ConfigureAwait(false);
await transport.Send(packet, token).ConfigureAwait(false);
}
}
}
@ -42,7 +42,7 @@ namespace TLSharp.Core.Network
{
token.ThrowIfCancellationRequested();
var result = await _transport.Receive(token).ConfigureAwait(false);
var result = await transport.Receive(token).ConfigureAwait(false);
using (var memoryStream = new MemoryStream(result.Body))
{

30
TLSharp.Core/Network/MtProtoSender.cs
View file

@ -21,20 +21,20 @@ namespace TLSharp.Core.Network
{
//private ulong sessionId = GenerateRandomUlong();
private readonly TcpTransport _transport;
private readonly Session _session;
private readonly TcpTransport transport;
private readonly Session session;
public readonly List<ulong> needConfirmation = new List<ulong>();
public MtProtoSender(TcpTransport transport, Session session)
{
_transport = transport;
_session = session;
this.transport = transport;
this.session = session;
}
private int GenerateSequence(bool confirmed)
{
return confirmed ? _session.Sequence++ * 2 + 1 : _session.Sequence * 2;
return confirmed ? session.Sequence++ * 2 + 1 : session.Sequence * 2;
}
public async Task Send(TeleSharp.TL.TLMethod request, CancellationToken token = default(CancellationToken))
@ -62,14 +62,14 @@ namespace TLSharp.Core.Network
await Send(memory.ToArray(), request, token).ConfigureAwait(false);
}
_session.Save();
session.Save();
}
public async Task Send(byte[] packet, TeleSharp.TL.TLMethod request, CancellationToken token = default(CancellationToken))
{
token.ThrowIfCancellationRequested();
request.MessageId = _session.GetNewMessageId();
request.MessageId = session.GetNewMessageId();
byte[] msgKey;
byte[] ciphertext;
@ -77,15 +77,15 @@ namespace TLSharp.Core.Network
{
using (BinaryWriter plaintextWriter = new BinaryWriter(plaintextPacket))
{
plaintextWriter.Write(_session.Salt);
plaintextWriter.Write(_session.Id);
plaintextWriter.Write(session.Salt);
plaintextWriter.Write(session.Id);
plaintextWriter.Write(request.MessageId);
plaintextWriter.Write(GenerateSequence(request.Confirmed));
plaintextWriter.Write(packet.Length);
plaintextWriter.Write(packet);
msgKey = Helpers.CalcMsgKey(plaintextPacket.GetBuffer());
ciphertext = AES.EncryptAES(Helpers.CalcKey(_session.AuthKey.Data, msgKey, true), plaintextPacket.GetBuffer());
ciphertext = AES.EncryptAES(Helpers.CalcKey(session.AuthKey.Data, msgKey, true), plaintextPacket.GetBuffer());
}
}
@ -93,11 +93,11 @@ namespace TLSharp.Core.Network
{
using (BinaryWriter writer = new BinaryWriter(ciphertextPacket))
{
writer.Write(_session.AuthKey.Id);
writer.Write(session.AuthKey.Id);
writer.Write(msgKey);
writer.Write(ciphertext);
await _transport.Send(ciphertextPacket.GetBuffer(), token).ConfigureAwait(false);
await transport.Send(ciphertextPacket.GetBuffer(), token).ConfigureAwait(false);
}
}
}
@ -116,7 +116,7 @@ namespace TLSharp.Core.Network
ulong remoteAuthKeyId = inputReader.ReadUInt64(); // TODO: check auth key id
byte[] msgKey = inputReader.ReadBytes(16); // TODO: check msg_key correctness
AESKeyData keyData = Helpers.CalcKey(_session.AuthKey.Data, msgKey, false);
AESKeyData keyData = Helpers.CalcKey(session.AuthKey.Data, msgKey, false);
byte[] plaintext = AES.DecryptAES(keyData, inputReader.ReadBytes((int)(inputStream.Length - inputStream.Position)));
@ -138,7 +138,7 @@ namespace TLSharp.Core.Network
{
while (!request.ConfirmReceived)
{
var result = DecodeMessage((await _transport.Receive(token).ConfigureAwait(false)).Body);
var result = DecodeMessage((await transport.Receive(token).ConfigureAwait(false)).Body);
using (var messageStream = new MemoryStream(result.Item1, false))
using (var messageReader = new BinaryReader(messageStream))
@ -439,7 +439,7 @@ namespace TLSharp.Core.Network
//logger.debug("bad_server_salt: msgid {0}, seq {1}, errorcode {2}, newsalt {3}", badMsgId, badMsgSeqNo, errorCode, newSalt);
_session.Salt = newSalt;
session.Salt = newSalt;
//resend
Send(request, token);

8
TLSharp.Core/Network/Requests/AckRequest.cs
View file

@ -7,19 +7,19 @@ namespace TLSharp.Core.Network.Requests
{
public class AckRequest : TLMethod
{
private readonly List<ulong> _msgs;
private readonly List<ulong> msgs;
public AckRequest(List<ulong> msgs)
{
_msgs = msgs;
this.msgs = msgs;
}
public override void SerializeBody(BinaryWriter writer)
{
writer.Write(0x62d6b459); // msgs_ack
writer.Write(0x1cb5c415); // Vector
writer.Write(_msgs.Count);
foreach (ulong messageId in _msgs)
writer.Write(msgs.Count);
foreach (ulong messageId in msgs)
{
writer.Write(messageId);
}

34
TLSharp.Core/Network/TcpTransport.cs
View file

@ -10,8 +10,8 @@ namespace TLSharp.Core.Network
public class TcpTransport : IDisposable
{
private readonly TcpClient _tcpClient;
private readonly NetworkStream _stream;
private readonly TcpClient tcpClient;
private readonly NetworkStream stream;
private int sendCounter = 0;
public TcpTransport(string address, int port, TcpClientConnectionHandler handler = null)
@ -21,38 +21,38 @@ namespace TLSharp.Core.Network
var ipAddress = IPAddress.Parse(address);
var endpoint = new IPEndPoint(ipAddress, port);
_tcpClient = new TcpClient(ipAddress.AddressFamily);
_tcpClient.Connect(endpoint);
tcpClient = new TcpClient(ipAddress.AddressFamily);
tcpClient.Connect(endpoint);
}
else
_tcpClient = handler(address, port);
tcpClient = handler(address, port);
if (_tcpClient.Connected)
if (tcpClient.Connected)
{
_stream = _tcpClient.GetStream();
stream = tcpClient.GetStream();
}
}
public async Task Send(byte[] packet, CancellationToken token = default(CancellationToken))
{
if (!_tcpClient.Connected)
if (!tcpClient.Connected)
throw new InvalidOperationException("Client not connected to server.");
var tcpMessage = new TcpMessage(sendCounter, packet);
await _stream.WriteAsync(tcpMessage.Encode(), 0, tcpMessage.Encode().Length, token).ConfigureAwait(false);
await stream.WriteAsync(tcpMessage.Encode(), 0, tcpMessage.Encode().Length, token).ConfigureAwait(false);
sendCounter++;
}
public async Task<TcpMessage> Receive(CancellationToken token = default(CancellationToken))
{
var packetLengthBytes = new byte[4];
if (await _stream.ReadAsync(packetLengthBytes, 0, 4, token).ConfigureAwait(false) != 4)
if (await stream.ReadAsync(packetLengthBytes, 0, 4, token).ConfigureAwait(false) != 4)
throw new InvalidOperationException("Couldn't read the packet length");
int packetLength = BitConverter.ToInt32(packetLengthBytes, 0);
var seqBytes = new byte[4];
if (await _stream.ReadAsync(seqBytes, 0, 4, token).ConfigureAwait(false) != 4)
if (await stream.ReadAsync(seqBytes, 0, 4, token).ConfigureAwait(false) != 4)
throw new InvalidOperationException("Couldn't read the sequence");
int seq = BitConverter.ToInt32(seqBytes, 0);
@ -63,7 +63,7 @@ namespace TLSharp.Core.Network
do
{
var bodyByte = new byte[packetLength - 12];
var availableBytes = await _stream.ReadAsync(bodyByte, 0, neededToRead, token).ConfigureAwait(false);
var availableBytes = await stream.ReadAsync(bodyByte, 0, neededToRead, token).ConfigureAwait(false);
neededToRead -= availableBytes;
Buffer.BlockCopy(bodyByte, 0, body, readBytes, availableBytes);
readBytes += availableBytes;
@ -71,7 +71,7 @@ namespace TLSharp.Core.Network
while (readBytes != packetLength - 12);
var crcBytes = new byte[4];
if (await _stream.ReadAsync(crcBytes, 0, 4, token).ConfigureAwait(false) != 4)
if (await stream.ReadAsync(crcBytes, 0, 4, token).ConfigureAwait(false) != 4)
throw new InvalidOperationException("Couldn't read the crc");
int checksum = BitConverter.ToInt32(crcBytes, 0);
@ -96,17 +96,17 @@ namespace TLSharp.Core.Network
{
get
{
return this._tcpClient.Connected;
return this.tcpClient.Connected;
}
}
public void Dispose()
{
if (_tcpClient.Connected)
if (tcpClient.Connected)
{
_stream.Close();
_tcpClient.Close();
stream.Close();
tcpClient.Close();
}
}
}