Skip to content

Commit

Permalink
Protocol: Reorganize files
Browse files Browse the repository at this point in the history
  • Loading branch information
xmegz committed May 30, 2023
1 parent c8caa81 commit 32febe7
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 100 deletions.
2 changes: 1 addition & 1 deletion MndpTray/MndpService.Core/MndpService.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Company>Pádár Tamás</Company>
<Copyright>2018-2023</Copyright>
<Title>MndpService.Core</Title>
<PackageTags>windows mikrotik tool network udp discovery broadcast cpd lldp network-discovery routeros net-framework mikrotik-router mndp</PackageTags>
<PackageTags>windows mikrotik tool network udp discovery broadcast cpd lldp network-discovery routeros dotnet net-framework mikrotik-router mndp</PackageTags>
<Description>MNDP - Mikrotik Neighbor Discovery Protocol - Service Tool</Description>
<PackageProjectUrl>https://github.com/xmegz/MndpTray</PackageProjectUrl>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand Down
2 changes: 1 addition & 1 deletion MndpTray/MndpTray.Core/MndpTray.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Company>Pádár Tamás</Company>
<Copyright>2018-2023</Copyright>
<Title>MndpTray.Core</Title>
<PackageTags>windows mikrotik tool network udp discovery broadcast cpd lldp network-discovery routeros net-framework mikrotik-router mndp</PackageTags>
<PackageTags>windows mikrotik tool network udp discovery broadcast cpd lldp network-discovery routeros dotnet net-framework mikrotik-router mndp</PackageTags>
<Description>MNDP - Mikrotik Neighbor Discovery Protocol - Tray Application Tool</Description>
<PackageProjectUrl>https://github.com/xmegz/MndpTray</PackageProjectUrl>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand Down
2 changes: 1 addition & 1 deletion MndpTray/MndpTray.Protocol/MndpTray.Protocol.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<RepositoryUrl>https://github.com/xmegz/MndpTray</RepositoryUrl>
<PackageIcon>Images\favicon.jpg</PackageIcon>
<Description>Mikrotik Neighbor Discovery Protocol - Network Discovery</Description>
<PackageTags>mikrotik windows linux tool network udp discovery broadcast beacon cpd lldp network-discovery routeros net-framework mikrotik-router mndp</PackageTags>
<PackageTags>mikrotik windows linux tool network udp discovery broadcast beacon cpd lldp network-discovery routeros dotnet net-framework mikrotik-router mndp</PackageTags>
<ApplicationIcon>Images\favicon.ico</ApplicationIcon>
<Title>MndpTray.Protocol</Title>
<PackageReleaseNotes>Multi targeting .net 4.6.2 .net standard 2.0</PackageReleaseNotes>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -613,101 +613,4 @@ public bool Write(BinaryWriter bw)
#endregion Methods
}
}

/// <summary>
/// Mikrotik discovery message with extensions.
/// </summary>
public class MndpMessageEx : MndpMessage, ICloneable
{
#region Props

/// <summary>
/// Gets time elapsed since message received.
/// </summary>
public double Age
{
get { return (DateTime.Now - this.ReceiveDateTime).TotalSeconds; }
}

/// <summary>
/// Gets or Sets sender broadcast address.
/// </summary>
public string BroadcastAddress { get; set; }

/// <summary>
/// Gets or sets message receive DateTime.
/// </summary>
public DateTime ReceiveDateTime { get; set; }

/// <summary>
/// Gets or sets sender unicast IPv4 address.
/// </summary>
public string UnicastAddress { get; set; }

/// <summary>
/// Gets sender mac address formatted ( ':' delimited ).
/// </summary>
/// <example>
/// AA:BB:CC:DD:EE:FF .
/// </example>
public string MacAddressDelimited
{
get
{
if (this.MacAddress == null)
{
return null;
}

StringBuilder sb = new StringBuilder();

for (int i = 0; i < this.MacAddress.Length; i++)
{
sb.Append(this.MacAddress[i]);
if (i % 2 == 1)
{
sb.Append(':');
}
}

if (sb.Length > 0)
{
sb.Remove(sb.Length - 1, 1);
}

return sb.ToString();
}
}

#endregion Props

#region Methods

/// <summary>
/// Clone object.
/// </summary>
/// <returns>Message object.</returns>
public object Clone()
{
return this.MemberwiseClone();
}

/// <summary>
/// Debug message.
/// </summary>
/// <returns>Debug string.</returns>
public override string ToString()
{
var sb = new StringBuilder();

sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.ReceiveDateTime), this.ReceiveDateTime);
sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.UnicastAddress), this.UnicastAddress);
sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.BroadcastAddress), this.BroadcastAddress);
sb.Append(base.ToString());

return sb.ToString();
}

#endregion Methods
}
}
107 changes: 107 additions & 0 deletions MndpTray/MndpTray.Protocol/Models/MndpMessageEx.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/*-----------------------------------------------------------------------------
* Project: MndpTray
* Repository: https://github.com/xmegz/MndpTray
* Author: Pádár Tamás
-----------------------------------------------------------------------------*/
namespace MndpTray.Protocol
{
using System;
using System.Text;

/// <summary>
/// Mikrotik discovery message with extensions.
/// </summary>
public class MndpMessageEx : MndpMessage, ICloneable
{
#region Props

/// <summary>
/// Gets time elapsed since message received.
/// </summary>
public double Age
{
get { return (DateTime.Now - this.ReceiveDateTime).TotalSeconds; }
}

/// <summary>
/// Gets or Sets sender broadcast address.
/// </summary>
public string BroadcastAddress { get; set; }

/// <summary>
/// Gets or sets message receive DateTime.
/// </summary>
public DateTime ReceiveDateTime { get; set; }

/// <summary>
/// Gets or sets sender unicast IPv4 address.
/// </summary>
public string UnicastAddress { get; set; }

/// <summary>
/// Gets sender mac address formatted ( ':' delimited ).
/// </summary>
/// <example>
/// AA:BB:CC:DD:EE:FF .
/// </example>
public string MacAddressDelimited
{
get
{
if (this.MacAddress == null)
{
return null;
}

StringBuilder sb = new StringBuilder();

for (int i = 0; i < this.MacAddress.Length; i++)
{
sb.Append(this.MacAddress[i]);
if (i % 2 == 1)
{
sb.Append(':');
}
}

if (sb.Length > 0)
{
sb.Remove(sb.Length - 1, 1);
}

return sb.ToString();
}
}

#endregion Props

#region Methods

/// <summary>
/// Clone object.
/// </summary>
/// <returns>Message object.</returns>
public object Clone()
{
return this.MemberwiseClone();
}

/// <summary>
/// Debug message.
/// </summary>
/// <returns>Debug string.</returns>
public override string ToString()
{
var sb = new StringBuilder();

sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.ReceiveDateTime), this.ReceiveDateTime);
sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.UnicastAddress), this.UnicastAddress);
sb.AppendFormat("\t{0}:{1}," + Environment.NewLine, nameof(this.BroadcastAddress), this.BroadcastAddress);
sb.Append(base.ToString());

return sb.ToString();
}

#endregion Methods
}
}

0 comments on commit 32febe7

Please sign in to comment.