Added ether_type argument to RAW protocol support code

ccie18643 · Sep 17, 2024 · aa28335 · aa28335
1 parent 9224970
commit aa28335
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/pytcp/protocols/enums.py b/pytcp/protocols/enums.py
@@ -90,7 +90,7 @@ def from_proto(proto: Proto) -> EtherType:
             return EtherType.ARP
 
         if isinstance(proto, Raw):
-            return EtherType.RAW
+            return proto.ether_type
 
         assert False, f"Unknown protocol: {type(proto)}"
 

diff --git a/pytcp/protocols/raw/raw__assembler.py b/pytcp/protocols/raw/raw__assembler.py
@@ -37,7 +37,7 @@
 
 from pytcp.lib.proto_assembler import ProtoAssembler
 from pytcp.lib.tracker import Tracker
-from pytcp.protocols.enums import IpProto
+from pytcp.protocols.enums import EtherType, IpProto
 from pytcp.protocols.raw.raw__base import Raw
 
 
@@ -52,6 +52,7 @@ def __init__(
         self,
         *,
         raw__payload: bytes = bytes(),
+        ether_type: EtherType = EtherType.RAW,
         ip_proto: IpProto = IpProto.RAW,
         echo_tracker: Tracker | None = None,
     ) -> None:
@@ -62,4 +63,5 @@ def __init__(
         self._tracker: Tracker = Tracker(prefix="TX", echo_tracker=echo_tracker)
 
         self._payload: bytes = raw__payload
+        self._ether_type: EtherType = ether_type
         self._ip_proto: IpProto = ip_proto
diff --git a/pytcp/protocols/raw/raw__base.py b/pytcp/protocols/raw/raw__base.py
@@ -38,7 +38,7 @@
 from typing import override
 
 from pytcp.lib.proto import Proto
-from pytcp.protocols.enums import IpProto
+from pytcp.protocols.enums import EtherType, IpProto
 
 
 class Raw(Proto):
@@ -47,6 +47,7 @@ class Raw(Proto):
     """
 
     _payload: bytes
+    _ether_type: EtherType
     _ip_proto: IpProto
 
     @override
@@ -89,6 +90,14 @@ def payload(self) -> bytes:
 
         return self._payload
 
+    @property
+    def ether_type(self) -> EtherType:
+        """
+        Get the Ethernet protocol number.
+        """
+
+        return self._ether_type
+
     @property
     def ip_proto(self) -> IpProto:
         """