mirror of
https://github.com/bettercap/bettercap
synced 2025-08-19 21:13:18 -07:00
fix: using statically linked version of gopacket (fixes #98)
This commit is contained in:
parent
75ef2b8a8f
commit
496c29b5bc
24 changed files with 44 additions and 44 deletions
|
@ -14,12 +14,12 @@ import (
|
|||
"github.com/bettercap/bettercap/packets"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
|
||||
// TODO: refactor to use gopacket when gopacket folks
|
||||
// will fix this > https://github.com/google/gopacket/issues/334
|
||||
// will fix this > https://github.com/bettercap/gopacket/issues/334
|
||||
"github.com/mdlayher/dhcp6"
|
||||
"github.com/mdlayher/dhcp6/dhcp6opts"
|
||||
)
|
||||
|
|
|
@ -12,9 +12,9 @@ import (
|
|||
"github.com/bettercap/bettercap/packets"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
)
|
||||
|
||||
type DNSSpoofer struct {
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
type Sniffer struct {
|
||||
|
|
|
@ -8,8 +8,8 @@ import (
|
|||
"github.com/bettercap/bettercap/log"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/google/gopacket/pcapgo"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket/pcapgo"
|
||||
)
|
||||
|
||||
type SnifferContext struct {
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
|
||||
"github.com/bettercap/bettercap/core"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func dnsParser(ip *layers.IPv4, pkt gopacket.Packet, udp *layers.UDP) bool {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package modules
|
||||
|
||||
import (
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func dot11Parser(radiotap *layers.RadioTap, dot11 *layers.Dot11, pkt gopacket.Packet, verbose bool) {
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
|
||||
"github.com/bettercap/bettercap/core"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func httpParser(ip *layers.IPv4, pkt gopacket.Packet, tcp *layers.TCP) bool {
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"github.com/bettercap/bettercap/core"
|
||||
"github.com/bettercap/bettercap/packets"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func krb5Parser(ip *layers.IPv4, pkt gopacket.Packet, udp *layers.UDP) bool {
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"github.com/bettercap/bettercap/core"
|
||||
"github.com/bettercap/bettercap/packets"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -7,8 +7,8 @@ import (
|
|||
"github.com/bettercap/bettercap/log"
|
||||
"github.com/bettercap/bettercap/packets"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func tcpParser(ip *layers.IPv4, pkt gopacket.Packet, verbose bool) {
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"github.com/bettercap/bettercap/core"
|
||||
"regexp"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
// poor man's TLS Client Hello with SNI extension parser :P
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"net"
|
||||
"time"
|
||||
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
|
||||
"github.com/bettercap/bettercap/core"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
|
|
@ -13,8 +13,8 @@ import (
|
|||
"github.com/bettercap/bettercap/packets"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
|
||||
"github.com/malfunkt/iprange"
|
||||
)
|
||||
|
|
|
@ -15,9 +15,9 @@ import (
|
|||
"github.com/bettercap/bettercap/packets"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
|
||||
"github.com/dustin/go-humanize"
|
||||
)
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
"github.com/bettercap/bettercap/packets"
|
||||
"github.com/bettercap/bettercap/session"
|
||||
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
)
|
||||
|
||||
// only matches gateway lines
|
||||
|
|
|
@ -3,7 +3,7 @@ package packets
|
|||
import (
|
||||
"net"
|
||||
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
func NewARPTo(from net.IP, from_hw net.HardwareAddr, to net.IP, to_hw net.HardwareAddr, req uint16) (layers.Ethernet, layers.ARP) {
|
||||
|
|
|
@ -3,7 +3,7 @@ package packets
|
|||
import (
|
||||
"errors"
|
||||
// TODO: refactor to use gopacket when gopacket folks
|
||||
// will fix this > https://github.com/google/gopacket/issues/334
|
||||
// will fix this > https://github.com/bettercap/gopacket/issues/334
|
||||
"github.com/mdlayher/dhcp6"
|
||||
)
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package packets
|
||||
|
||||
import (
|
||||
"github.com/google/gopacket"
|
||||
"github.com/bettercap/gopacket"
|
||||
)
|
||||
|
||||
type DHCPv6Layer struct {
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"fmt"
|
||||
"net"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
)
|
||||
|
||||
type Dot11CipherType uint8
|
||||
|
|
|
@ -8,9 +8,9 @@ import (
|
|||
|
||||
"github.com/bettercap/bettercap/network"
|
||||
|
||||
"github.com/google/gopacket"
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/google/gopacket/pcap"
|
||||
"github.com/bettercap/gopacket"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/pcap"
|
||||
)
|
||||
|
||||
type Activity struct {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package packets
|
||||
|
||||
import (
|
||||
"github.com/google/gopacket"
|
||||
"github.com/bettercap/gopacket"
|
||||
)
|
||||
|
||||
var SerializationOptions = gopacket.SerializeOptions{
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package packets
|
||||
|
||||
import (
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"net"
|
||||
)
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package packets
|
||||
|
||||
import (
|
||||
"github.com/google/gopacket/layers"
|
||||
"github.com/bettercap/gopacket/layers"
|
||||
"net"
|
||||
)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue