Skip to content

Parse control connection line in class #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Parse control connection line in class #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions src/Tor/Circuits/Circuit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,85 @@ internal Circuit(Client client, int id)
this.timeCreated = DateTime.MinValue;
}

/// <summary>
/// Creates a new instance of the <see cref="Circuit"/> class from respone line.
/// </summary>
/// <param name="client">The client for which the circuit belongs.</param>
/// <param name="line">The line which was received from the control connection.</param>
/// <returns>
/// <c>Circuit</c> a new instance.
/// </returns>
public static Circuit FromLine(Client client, string line)
{
int index = 0;
int circuitID = 0;
string[] parts = StringHelper.GetAll(line, ' ');
Circuit circuit = null;
List<string> routers = new List<string>();

if (parts == null || parts.Length < 2)
return null;

if (!int.TryParse(parts[0], out circuitID))
return null;

circuit = new Circuit(client, circuitID);
circuit.Status = ReflectionHelper.GetEnumerator<CircuitStatus, DescriptionAttribute>(attr => parts[1].Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));

for (int i = 2, length = parts.Length; i < length; i++)
{
string data = parts[i];

index += data.Length + 1;
data = data.Trim();

if (!data.Contains("="))
{
routers.AddRange(data.Split(','));
continue;
}

string[] values = data.Split(new[] { '=' }, 2);
string name = values[0].Trim();
string value = values[1].Trim();

if (name.Equals("BUILD_FLAGS"))
{
string[] flags = value.Split(',');

foreach (string flag in flags)
circuit.BuildFlags |= ReflectionHelper.GetEnumerator<CircuitBuildFlags, DescriptionAttribute>(attr => flag.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
}
else
{
switch (name)
{
case "HS_STATE":
circuit.HSState = ReflectionHelper.GetEnumerator<CircuitHSState, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "PURPOSE":
circuit.Purpose = ReflectionHelper.GetEnumerator<CircuitPurpose, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "REASON":
circuit.Reason = ReflectionHelper.GetEnumerator<CircuitReason, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "TIME_CREATED":
DateTime timeCreated;
if (DateTime.TryParse(value, out timeCreated))
circuit.TimeCreated = timeCreated;
else
circuit.TimeCreated = DateTime.MinValue;
break;
}
}
}

circuit.Paths = routers;
circuit.GetRouters();

return circuit;
}

#region Properties

/// <summary>
Expand Down
67 changes: 2 additions & 65 deletions src/Tor/Events/Dispatchers/CircuitDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Tor.Helpers;
using System.ComponentModel;

namespace Tor.Events
{
Expand All @@ -24,70 +22,9 @@ internal sealed class CircuitDispatcher : Dispatcher
/// </returns>
public override bool Dispatch(string line)
{
int index = 0;
int circuitID = 0;
string[] parts = StringHelper.GetAll(line, ' ');
Circuit circuit = null;
List<string> routers = new List<string>();

if (parts == null || parts.Length < 2)
return false;

if (!int.TryParse(parts[0], out circuitID))
Circuit circuit = Circuit.FromLine(Client, line);
if (circuit == null)
return false;

circuit = new Circuit(Client, circuitID);
circuit.Status = ReflectionHelper.GetEnumerator<CircuitStatus, DescriptionAttribute>(attr => parts[1].Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));

for (int i = 2, length = parts.Length; i < length; i++)
{
string data = parts[i];

index += data.Length + 1;
data = data.Trim();

if (!data.Contains("="))
{
routers.AddRange(data.Split(','));
continue;
}

string[] values = data.Split(new[] { '=' }, 2);
string name = values[0].Trim();
string value = values[1].Trim();

if (name.Equals("BUILD_FLAGS"))
{
string[] flags = value.Split(',');

foreach (string flag in flags)
circuit.BuildFlags |= ReflectionHelper.GetEnumerator<CircuitBuildFlags, DescriptionAttribute>(attr => flag.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
}
else
{
switch (name)
{
case "HS_STATE":
circuit.HSState = ReflectionHelper.GetEnumerator<CircuitHSState, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "PURPOSE":
circuit.Purpose = ReflectionHelper.GetEnumerator<CircuitPurpose, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "REASON":
circuit.Reason = ReflectionHelper.GetEnumerator<CircuitReason, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
break;
case "TIME_CREATED":
DateTime timeCreated;
if (DateTime.TryParse(value, out timeCreated))
circuit.TimeCreated = timeCreated;
else
circuit.TimeCreated = DateTime.MinValue;
break;
}
}
}

circuit.Paths = routers;

Events.OnCircuitChanged(new CircuitEventArgs(circuit));

Expand Down
57 changes: 2 additions & 55 deletions src/Tor/Events/Dispatchers/ORConnectionDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Tor.Helpers;
using System.ComponentModel;

namespace Tor.Events
{
Expand All @@ -24,62 +22,11 @@ internal sealed class ORConnectionDispatcher : Dispatcher
/// </returns>
public override bool Dispatch(string line)
{
string target;
ORStatus status;
string[] parts = StringHelper.GetAll(line, ' ');
ORConnection connection = ORConnection.FromLine(line);

if (parts.Length < 2)
if (connection == null)
return false;

target = parts[0];
status = ReflectionHelper.GetEnumerator<ORStatus, DescriptionAttribute>(attr => parts[1].Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));

ORConnection connection = new ORConnection();
connection.Status = status;
connection.Target = target;

for (int i = 2; i < parts.Length; i++)
{
string data = parts[i].Trim();

if (!data.Contains("="))
continue;

string[] values = data.Split(new[] { '=' }, 2);

if (values.Length < 2)
continue;

string name = values[0].Trim();
string value = values[1].Trim();

if ("REASON".Equals(name, StringComparison.CurrentCultureIgnoreCase))
{
connection.Reason = ReflectionHelper.GetEnumerator<ORReason, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
continue;
}

if ("NCIRCS".Equals(name, StringComparison.CurrentCultureIgnoreCase))
{
int circuits;

if (int.TryParse(value, out circuits))
connection.CircuitCount = circuits;

continue;
}

if ("ID".Equals(name, StringComparison.CurrentCultureIgnoreCase))
{
int id;

if (int.TryParse(value, out id))
connection.ID = id;

continue;
}
}

Client.Events.OnORConnectionChanged(new ORConnectionEventArgs(connection));
return true;
}
Expand Down
63 changes: 2 additions & 61 deletions src/Tor/Events/Dispatchers/StreamDispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Tor.Helpers;
using System.ComponentModel;

namespace Tor.Events
{
Expand All @@ -24,68 +22,11 @@ internal sealed class StreamDispatcher : Dispatcher
/// </returns>
public override bool Dispatch(string line)
{
int streamID;
int circuitID;
int port;
StreamStatus status;
Host target;
string[] parts = StringHelper.GetAll(line, ' ');
Stream stream = Stream.FromLine(Client, line);

if (parts.Length < 4)
if (stream == null)
return false;

if ("Tor_internal".Equals(parts[3], StringComparison.CurrentCultureIgnoreCase))
return false;

if (!int.TryParse(parts[0], out streamID))
return false;

if (!int.TryParse(parts[2], out circuitID))
return false;

string[] targetParts = parts[3].Split(new[] { ':' }, 2);

if (targetParts.Length < 2)
return false;

if (!int.TryParse(targetParts[1], out port))
return false;

status = ReflectionHelper.GetEnumerator<StreamStatus, DescriptionAttribute>(attr => parts[1].Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
target = new Host(targetParts[0], port);

Stream stream = new Stream(Client, streamID, target);
stream.CircuitID = circuitID;
stream.Status = status;

for (int i = 4; i < parts.Length; i++)
{
string data = parts[i].Trim();

if (!data.Contains("="))
continue;

string[] values = data.Split(new[] { '=' }, 2);

if (values.Length < 2)
continue;

string name = values[0].Trim();
string value = values[1].Trim();

if ("REASON".Equals(name, StringComparison.CurrentCultureIgnoreCase))
{
stream.Reason = ReflectionHelper.GetEnumerator<StreamReason, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
continue;
}

if ("PURPOSE".Equals(name, StringComparison.CurrentCultureIgnoreCase))
{
stream.Purpose = ReflectionHelper.GetEnumerator<StreamPurpose, DescriptionAttribute>(attr => value.Equals(attr.Description, StringComparison.CurrentCultureIgnoreCase));
continue;
}
}

Events.OnStreamChanged(new StreamEventArgs(stream));
return true;
}
Expand Down
Loading