github.com/livingcomputermuseum.ContrAlto
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/ContrAlto.git synced 2026-01-20 01:44:34 +00:00
Code Issues Releases Wiki Activity

Fix for Ethernet bug introduced with switch to SharpPcap: Filtering of packets sent by ourselves doesn't actually take place. Amazingly this didn't break much, but Trek was affected and we can't have that.

Browse Source
This commit is contained in:
Josh Dersch 2017-07-11 11:25:02 -07:00
parent 1abb1db4d3
commit bfcce44a8f
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Contralto/IO/HostEthernetEncapsulation.cs
View File

@ -89,6 +89,9 @@ namespace Contralto.IO
Log.Write(LogComponent.HostNetworkInterface, "Specified ethernet interface does not exist or is not compatible with ContrAlto.");
throw new InvalidOperationException("Specified ethernet interface does not exist or is not compatible with ContrAlto.");
}
_10mbitMACPrefix[5] = Configuration.HostAddress; // Stuff our current Alto host address into the 10mbit MAC
_10mbitSourceAddress = new PhysicalAddress(_10mbitMACPrefix);
}
public void RegisterReceiveCallback(ReceivePacketDelegate callback)
@ -171,11 +174,11 @@ namespace Contralto.IO
Conversion.ToOctal(destinationHost),
length);
_10mbitMACPrefix[5] = Configuration.HostAddress; // Stuff our current Alto host address into the 10mbit MAC
UpdateSourceAddress();
EthernetPacket p = new EthernetPacket(
new PhysicalAddress(_10mbitMACPrefix), // Source address
_10mbitBroadcast, // Destnation (broadcast)
_10mbitSourceAddress, // Source address
_10mbitBroadcast, // Destnation (broadcast)
(EthernetPacketType)_3mbitFrameType);
p.PayloadData = packetBytes;
@ -191,14 +194,14 @@ namespace Contralto.IO
//
// Filter out packets intended for the emulator, forward them on, drop everything else.
//
if (e.Packet.LinkLayerType == PacketDotNet.LinkLayers.Ethernet)
if (e.Packet.LinkLayerType == LinkLayers.Ethernet)
{
EthernetPacket packet = (EthernetPacket)PacketDotNet.Packet.ParsePacket(PacketDotNet.LinkLayers.Ethernet, e.Packet.Data);
EthernetPacket packet = (EthernetPacket)Packet.ParsePacket(LinkLayers.Ethernet, e.Packet.Data);
_10mbitMACPrefix[5] = Configuration.HostAddress;
UpdateSourceAddress();
if ((int)packet.Type == _3mbitFrameType && // encapsulated 3mbit frames
(packet.SourceHwAddress != new System.Net.NetworkInformation.PhysicalAddress(_10mbitMACPrefix))) // and not sent by this emulator
if ((int)packet.Type == _3mbitFrameType && // encapsulated 3mbit frames
(!packet.SourceHwAddress.Equals(_10mbitSourceAddress))) // and not sent by this emulator
{
Log.Write(LogComponent.HostNetworkInterface, "Received encapsulated 3mbit packet.");
_callback(new System.IO.MemoryStream(packet.PayloadData));
@ -210,6 +213,17 @@ namespace Contralto.IO
}
}
private void UpdateSourceAddress()
{
// Ensure our host MAC address is in sync with any configuration changes
// TODO: having a Configuration Changed event would make this less ugly.
if (Configuration.HostAddress != _10mbitSourceAddress.GetAddressBytes()[5])
{
_10mbitMACPrefix[5] = Configuration.HostAddress; // Stuff our current Alto host address into the 10mbit MAC
_10mbitSourceAddress = new PhysicalAddress(_10mbitMACPrefix);
}
}
private void AttachInterface(ICaptureDevice iface)
{
_interface = iface;
@ -262,6 +276,7 @@ namespace Contralto.IO
/// </summary>
private byte[] _10mbitMACPrefix = { 0x00, 0x00, 0xaa, 0x01, 0x02, 0x00 }; // 00-00-AA is the Xerox vendor code, used just to be cute.
private PhysicalAddress _10mbitSourceAddress;
private PhysicalAddress _10mbitBroadcast = new PhysicalAddress(new byte[] { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff });
}
}