Merge pull request #1 from shadowy-pycoder/oui

Oui package

Author: shadowy-pycoder

README.md

@@ -1,4 +1,5 @@
 ![mshark_new](https://github.com/user-attachments/assets/ee1b9526-dcae-4ff8-962d-315897e49ed0)
+
 # mShark - Mini [Wireshark](https://www.wireshark.org/) written in Go
 
 [![Go Reference](https://pkg.go.dev/badge/github.com/shadowy-pycoder/mshark.svg)](https://pkg.go.dev/github.com/shadowy-pycoder/mshark)
@@ -8,7 +9,6 @@
 ![GitHub Release](https://img.shields.io/github/v/release/shadowy-pycoder/mshark)
 ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/shadowy-pycoder/mshark/total)
 
-
 ## Installation
 
 Download release from [Releases](https://github.com/shadowy-pycoder/mshark/releases) Page.
@@ -18,9 +18,11 @@ Or install using `go install` (requires Go 1.23+ but may work with older version
 ```shell
 CGO_ENABLED=0 go install -ldflags "-s -w" -trimpath github.com/shadowy-pycoder/mshark/cmd/mshark@latest
 ```
+
 This will install the `mshark` binary to your `$GOPATH/bin` directory.
 
-If you are getting a `Permission denied` error when running `mshark`, try running 
+If you are getting a `Permission denied` error when running `mshark`, try running
+
 ```shell
 sudo setcap cap_net_raw+ep ~/go/bin/mshark
 ```
@@ -30,24 +32,26 @@ sudo setcap cap_net_raw+ep ~/go/bin/mshark
 ```shell
 mshark -h
 
-                ______   __                            __       
-               /      \ |  \                          |  \      
- ______ ____  |  $$$$$$\| $$____    ______    ______  | $$   __ 
+                ______   __                            __
+               /      \ |  \                          |  \
+ ______ ____  |  $$$$$$\| $$____    ______    ______  | $$   __
 |      \    \ | $$___\$$| $$    \  |      \  /      \ | $$  /  \
 | $$$$$$\$$$$\ \$$    \ | $$$$$$$\  \$$$$$$\|  $$$$$$\| $$_/  $$
-| $$ | $$ | $$ _\$$$$$$\| $$  | $$ /      $$| $$   \$$| $$   $$ 
-| $$ | $$ | $$|  \__| $$| $$  | $$|  $$$$$$$| $$      | $$$$$$\ 
+| $$ | $$ | $$ _\$$$$$$\| $$  | $$ /      $$| $$   \$$| $$   $$
+| $$ | $$ | $$|  \__| $$| $$  | $$|  $$$$$$$| $$      | $$$$$$\
 | $$ | $$ | $$ \$$    $$| $$  | $$ \$$    $$| $$      | $$  \$$\
  \$$  \$$  \$$  \$$$$$$  \$$   \$$  \$$$$$$$ \$$       \$$   \$$
-                                                                                                                                                                                              
-Packet Capture Tool by shadowy-pycoder 
+
+Packet Capture Tool by shadowy-pycoder
 
 GitHub: https://github.com/shadowy-pycoder/mshark
 
 Usage: mshark [OPTIONS]
 Options:
   -h    Show this help message and exit.
   -D    Display list of interfaces and exit.
+  -b int
+        The maximum size of packet queue. (default 8192)
   -c int
         The maximum number of packets to capture.
   -e string
@@ -62,13 +66,14 @@ Options:
   -t duration
         The maximum duration of the packet capture process. Example: 5s
   -v	Display full packet info when capturing to stdout or txt.
-``` 
+```
 
 ### Example
 
 ```shell
 mshark -p -f=txt -f=stdout -f=pcapng -i eth0 -e="port 53"
 ```
+
 The above command will capture packets containing `port 53` (assumed to be DNS queries) from the `eth0` interface and write the captured data to `stdout`, `txt`, and file in `pcapng` format. Files are created in the current working directory.
 
 Output:
@@ -79,20 +84,21 @@ Output:
 - Promiscuous Mode: true
 - Timeout: 0s
 - Number of Packets: 0
+- Packet Buffer Size: 8192
 - BPF Filter: "port 53"
 - Verbose: false
 ```
+
 ![Screenshot from 2024-09-17 09-37-50](https://github.com/user-attachments/assets/44c233ee-85a4-43f2-8f65-1ef239362bab)
 
 With `-v` flag enabled, you will see more detailed information:
 
-
 ![Screenshot from 2024-09-17 09-56-20](https://github.com/user-attachments/assets/11539ea7-779e-4faf-8fce-2eea9ab653c7)
 ![Screenshot from 2024-09-17 09-56-47](https://github.com/user-attachments/assets/26b6353d-d312-40c5-9917-3f2f7bb8abdc)
 
 ## Supported layers
 
-- [Ethernet](https://en.wikipedia.org/wiki/Ethernet_frame) 
+- [Ethernet](https://en.wikipedia.org/wiki/Ethernet_frame)
 - [IPv4](https://en.wikipedia.org/wiki/IPv4)
 - [IPv6](https://en.wikipedia.org/wiki/IPv6)
 - [ARP](https://en.wikipedia.org/wiki/Address_Resolution_Protocol)
@@ -107,7 +113,6 @@ With `-v` flag enabled, you will see more detailed information:
 - [SSH](https://en.wikipedia.org/wiki/Secure_Shell)
 - [TLS](https://en.wikipedia.org/wiki/Transport_Layer_Security)
 
-
 ## Roadmap
 
 - [x] Online packet capture to `stdout`, `txt`, `pcap` and `pcapng` files

arpspoof/arpspoof.go

@@ -0,0 +1,2 @@
+// Package arpspoof
+package arpspoof

cmd/mshark/cli.go

@@ -19,17 +19,17 @@ import (
 const app string = "mshark"
 
 const usagePrefix string = `
-                ______   __                            __       
-               /      \ |  \                          |  \      
- ______ ____  |  $$$$$$\| $$____    ______    ______  | $$   __ 
+                ______   __                            __
+               /      \ |  \                          |  \
+ ______ ____  |  $$$$$$\| $$____    ______    ______  | $$   __
 |      \    \ | $$___\$$| $$    \  |      \  /      \ | $$  /  \
 | $$$$$$\$$$$\ \$$    \ | $$$$$$$\  \$$$$$$\|  $$$$$$\| $$_/  $$
-| $$ | $$ | $$ _\$$$$$$\| $$  | $$ /      $$| $$   \$$| $$   $$ 
-| $$ | $$ | $$|  \__| $$| $$  | $$|  $$$$$$$| $$      | $$$$$$\ 
+| $$ | $$ | $$ _\$$$$$$\| $$  | $$ /      $$| $$   \$$| $$   $$
+| $$ | $$ | $$|  \__| $$| $$  | $$|  $$$$$$$| $$      | $$$$$$\
 | $$ | $$ | $$ \$$    $$| $$  | $$ \$$    $$| $$      | $$  \$$\
  \$$  \$$  \$$  \$$$$$$  \$$   \$$  \$$$$$$$ \$$       \$$   \$$
-                                                                                                                                                                                              
-Packet Capture Tool by shadowy-pycoder 
+
+Packet Capture Tool by shadowy-pycoder
 
 GitHub: https://github.com/shadowy-pycoder/mshark
 
@@ -79,7 +79,7 @@ func displayInterfaces() error {
 
 func createFile(app, ext string) (*os.File, error) {
 	path := fmt.Sprintf("./%s_%s.%s", app, time.Now().UTC().Format("20060102_150405"), ext)
-	f, err := os.OpenFile(filepath.FromSlash(path), os.O_CREATE|os.O_WRONLY, 0644)
+	f, err := os.OpenFile(filepath.FromSlash(path), os.O_CREATE|os.O_WRONLY, 0o644)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open file: %v", err)
 	}
@@ -92,12 +92,17 @@ func root(args []string) error {
 	flags := flag.NewFlagSet(app, flag.ExitOnError)
 	iface := flags.String("i", "any", "The name of the network interface. Example: eth0")
 	snaplen := flags.Int("s", 0, "The maximum length of each packet snapshot. Defaults to 65535.")
-	flags.BoolFunc("p", `Promiscuous mode. This setting is ignored for "any" interface. Defaults to false.`, func(flagValue string) error {
-		conf.Promisc = true
-		return nil
-	})
+	flags.BoolFunc(
+		"p",
+		`Promiscuous mode. This setting is ignored for "any" interface. Defaults to false.`,
+		func(flagValue string) error {
+			conf.Promisc = true
+			return nil
+		},
+	)
 	flags.DurationVar(&conf.Timeout, "t", 0, "The maximum duration of the packet capture process. Example: 5s")
 	flags.IntVar(&conf.PacketCount, "c", 0, "The maximum number of packets to capture.")
+	packetBuffer := flags.Int("b", 8192, "The maximum size of packet queue.")
 	flags.StringVar(&conf.Expr, "e", "", `BPF filter expression. Example: "ip proto tcp".`)
 	flags.BoolFunc("D", "Display list of interfaces and exit.", func(flagValue string) error {
 		if err := displayInterfaces(); err != nil {
@@ -137,6 +142,11 @@ func root(args []string) error {
 	}
 	conf.Snaplen = *snaplen
 
+	if *packetBuffer <= 0 {
+		*packetBuffer = 8192
+	}
+	conf.PacketBuffer = *packetBuffer
+
 	// creating writers and writing headers depending on a file extension
 	var pw []ms.PacketWriter
 	if len(exts) != 0 {
@@ -193,8 +203,5 @@ func root(args []string) error {
 		}
 		pw = append(pw, w)
 	}
-	if err := ms.OpenLive(&conf, pw...); err != nil {
-		return err
-	}
-	return nil
+	return ms.OpenLive(&conf, pw...)
 }

go.mod

@@ -1,20 +1,22 @@
 module github.com/shadowy-pycoder/mshark
 
-go 1.23.0
+go 1.24.1
 
 require (
+	github.com/magefile/mage v1.15.0
 	github.com/mdlayher/packet v1.1.2
 	github.com/packetcap/go-pcap v0.0.0-20240528124601-8c87ecf5dbc5
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/net v0.28.0
+	golang.org/x/text v0.27.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -6,6 +6,8 @@ github.com/gopacket/gopacket v1.2.0 h1:eXbzFad7f73P1n2EJHQlsKuvIMJjVXK5tXoSca78I
 github.com/gopacket/gopacket v1.2.0/go.mod h1:BrAKEy5EOGQ76LSqh7DMAr7z0NNPdczWm2GxCG7+I8M=
 github.com/josharian/native v1.1.0 h1:uuaP0hAbW7Y4l0ZRQ6C9zfb7Mg1mbFKry/xzDAfmtLA=
 github.com/josharian/native v1.1.0/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
+github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
+github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY=
 github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4=
 github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
@@ -18,10 +20,12 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
 golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=