added oui for MAC addresses

Author: shadowy-pycoder

go.mod

@@ -1,10 +1,11 @@
 module github.com/shadowy-pycoder/mshark
 
-go 1.23.0
+go 1.24.1
 
 require (
 	github.com/mdlayher/packet v1.1.2
 	github.com/packetcap/go-pcap v0.0.0-20240528124601-8c87ecf5dbc5
+	github.com/shadowy-pycoder/oui v0.5.2
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/net v0.28.0
 )

go.sum

@@ -14,6 +14,8 @@ github.com/packetcap/go-pcap v0.0.0-20240528124601-8c87ecf5dbc5 h1:p4VuaitqUAqSZ
 github.com/packetcap/go-pcap v0.0.0-20240528124601-8c87ecf5dbc5/go.mod h1:zIAoVKeWP0mz4zXY50UYQt6NLg2uwKRswMDcGEqOms4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shadowy-pycoder/oui v0.5.2 h1:865RE2ohoKxLFtUmQVfb/3LWaWyzREy0ksjTl4LdfsY=
+github.com/shadowy-pycoder/oui v0.5.2/go.mod h1:CLMFNpxNZ1ftiy+zCImvM15kVHjW7L1o8ehiTO5Dim8=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=

layers/arp.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"net"
 	"net/netip"
+
+	"github.com/shadowy-pycoder/oui"
 )
 
 const headerSizeARP = 28
@@ -45,6 +47,8 @@ type ARPPacket struct {
 	// In an ARP reply this field is used to indicate the address of the host that originated the ARP request.
 	TargetMAC net.HardwareAddr
 	TargetIP  netip.Addr // Internetwork address of the intended receiver.
+	dstVendor string
+	srcVendor string
 }
 
 func NewARPPacket(
@@ -71,6 +75,8 @@ func NewARPPacket(
 		SenderIP:         senderIP,
 		TargetMAC:        targetMAC,
 		TargetIP:         targetIP,
+		dstVendor:        oui.VendorWithMAC(targetMAC),
+		srcVendor:        oui.VendorWithMAC(senderMAC),
 	}, nil
 }
 
@@ -81,9 +87,9 @@ func (ap *ARPPacket) String() string {
 - HLen: %d
 - PLen: %d
 - Operation: %s
-- Sender MAC Address: %s
+- Sender MAC Address: %s (%s)
 - Sender IP Address: %s
-- Target MAC Address: %s
+- Target MAC Address: %s (%s)
 - Target IP Address: %s
 `,
 		ap.Summary(),
@@ -94,8 +100,10 @@ func (ap *ARPPacket) String() string {
 		ap.Plen,
 		ap.Op,
 		ap.SenderMAC,
+		ap.srcVendor,
 		ap.SenderIP,
 		ap.TargetMAC,
+		ap.dstVendor,
 		ap.TargetIP,
 	)
 }
@@ -167,6 +175,8 @@ func (ap *ARPPacket) UnmarshalBinary(data []byte) error {
 	if !ok {
 		return fmt.Errorf("failed parsing target IP address")
 	}
+	ap.dstVendor = oui.VendorWithMAC(ap.TargetMAC)
+	ap.srcVendor = oui.VendorWithMAC(ap.SenderMAC)
 	return nil
 }
 

layers/ethernet.go

@@ -5,6 +5,8 @@ import (
 	"encoding/hex"
 	"fmt"
 	"net"
+
+	"github.com/shadowy-pycoder/oui"
 )
 
 const headerSizeEthernet = 14
@@ -33,6 +35,8 @@ type EthernetFrame struct {
 	SrcMAC    net.HardwareAddr // MAC address of the source device.
 	EtherType *EthernetType    // The protocol of the upper layer.
 	Payload   []byte
+	dstVendor string
+	srcVendor string
 }
 
 func NewEthernetFrame(dstMAC, srcMAC net.HardwareAddr, et EtherType, payload []byte) (*EthernetFrame, error) {
@@ -44,26 +48,30 @@ func NewEthernetFrame(dstMAC, srcMAC net.HardwareAddr, et EtherType, payload []b
 		SrcMAC:    srcMAC,
 		EtherType: &EthernetType{Val: et, Desc: ethertypedesc(et)},
 		Payload:   payload,
+		dstVendor: oui.VendorWithMAC(dstMAC),
+		srcVendor: oui.VendorWithMAC(srcMAC),
 	}, nil
 }
 
 func (ef *EthernetFrame) String() string {
 	return fmt.Sprintf(`%s
-- DstMAC: %s
-- SrcMAC: %s
+- DstMAC: %s (%s)
+- SrcMAC: %s (%s)
 - EtherType: %s
 - Payload: %d bytes
 %s`,
 		ef.Summary(),
 		ef.DstMAC,
+		ef.dstVendor,
 		ef.SrcMAC,
+		ef.srcVendor,
 		ef.EtherType,
 		len(ef.Payload),
 		hex.Dump(ef.ToBytes()))
 }
 
 func (ef *EthernetFrame) Summary() string {
-	return fmt.Sprintf("Ethernet Frame: Src MAC: %s →  Dst MAC: %s", ef.SrcMAC, ef.DstMAC)
+	return fmt.Sprintf("Ethernet Frame: Src MAC: %s →  Dst MAC: %s", ef.srcVendor, ef.dstVendor)
 }
 
 func (ef *EthernetFrame) MarshalBinary() ([]byte, error) {
@@ -90,6 +98,8 @@ func (ef *EthernetFrame) UnmarshalBinary(data []byte) error {
 	etdesc := ethertypedesc(et)
 	ef.EtherType = &EthernetType{Val: et, Desc: etdesc}
 	ef.Payload = data[headerSizeEthernet:]
+	ef.dstVendor = oui.VendorWithMAC(ef.DstMAC)
+	ef.srcVendor = oui.VendorWithMAC(ef.SrcMAC)
 	return nil
 }