Skip to content

Commit

Permalink
Merge pull request #5 from meterup/sebastien/revert-google-replace
Browse files Browse the repository at this point in the history
Sebastien/revert google replace
  • Loading branch information
sebastien-meter authored Jun 21, 2024
2 parents 9414fce + 4539c64 commit 5fe7135
Show file tree
Hide file tree
Showing 172 changed files with 260 additions and 260 deletions.
2 changes: 1 addition & 1 deletion afpacket/afpacket.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"golang.org/x/net/bpf"
"golang.org/x/sys/unix"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion bsdbpf/bsd_bpf_sniffer.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"time"
"unsafe"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
"golang.org/x/sys/unix"
)

Expand Down
4 changes: 2 additions & 2 deletions defrag/lcmdefrag/lcmdefrag.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"fmt"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/layers"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions defrag/lcmdefrag/lcmdefrag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ package lcmdefrag
import (
"testing"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/layers"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ in a lot of interesting variables/maps (DecodersByLayerName, etc). Therefore,
it's recommended that even if you don't use any layers functions directly, you still import with:
import (
_ "github.com/meterup/gopacket/layers"
_ "github.com/google/gopacket/layers"
)
*/
package gopacket
6 changes: 3 additions & 3 deletions dumpcommand/tcpdump.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"os"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/ip4defrag"
"github.com/meterup/gopacket/layers" // pulls in all layers decoders
"github.com/google/gopacket"
"github.com/google/gopacket/ip4defrag"
"github.com/google/gopacket/layers" // pulls in all layers decoders
)

var (
Expand Down
10 changes: 5 additions & 5 deletions examples/afpacket/afpacket.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ import (
"runtime/pprof"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/afpacket"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/google/gopacket"
"github.com/google/gopacket/afpacket"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
"golang.org/x/net/bpf"

_ "github.com/meterup/gopacket/layers"
_ "github.com/google/gopacket/layers"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions examples/arpscan/arpscan.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"sync"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions examples/bidirectional/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ package main
import (
"flag"
"fmt"
"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/meterup/gopacket/tcpassembly"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
"github.com/google/gopacket/tcpassembly"
"log"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion examples/bytediff/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package main

import (
"fmt"
"github.com/meterup/gopacket/bytediff"
"github.com/google/gopacket/bytediff"
)

var sliceA = []byte{
Expand Down
12 changes: 6 additions & 6 deletions examples/httpassembly/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"net/http"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/meterup/gopacket/tcpassembly"
"github.com/meterup/gopacket/tcpassembly/tcpreader"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
"github.com/google/gopacket/tcpassembly"
"github.com/google/gopacket/tcpassembly/tcpreader"
)

var iface = flag.String("i", "eth0", "Interface to get packets from")
Expand Down
6 changes: 3 additions & 3 deletions examples/pcapdump/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ package main
import (
"flag"
"fmt"
"github.com/meterup/gopacket/dumpcommand"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/pcap"
"github.com/google/gopacket/dumpcommand"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/pcap"
"log"
"os"
"strings"
Expand Down
6 changes: 3 additions & 3 deletions examples/pcaplay/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"strings"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/pcap"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/pcap"
)

var iface = flag.String("i", "eth0", "Interface to write packets to")
Expand Down
6 changes: 3 additions & 3 deletions examples/pfdump/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ package main
import (
"flag"
"fmt"
"github.com/meterup/gopacket/dumpcommand"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/pfring"
"github.com/google/gopacket/dumpcommand"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/pfring"
"log"
"os"
"strings"
Expand Down
12 changes: 6 additions & 6 deletions examples/reassemblydump/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ import (
"sync"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/ip4defrag"
"github.com/meterup/gopacket/layers" // pulls in all layers decoders
"github.com/meterup/gopacket/pcap"
"github.com/meterup/gopacket/reassembly"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/ip4defrag"
"github.com/google/gopacket/layers" // pulls in all layers decoders
"github.com/google/gopacket/pcap"
"github.com/google/gopacket/reassembly"
)

var maxcount = flag.Int("c", -1, "Only grab this many packets, then exit")
Expand Down
4 changes: 2 additions & 2 deletions examples/snoopread/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"log"
"os"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/pcapgo"
"github.com/google/gopacket"
"github.com/google/gopacket/pcapgo"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions examples/statsassembly/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ package main

import (
"flag"
"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/meterup/gopacket/tcpassembly"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
"github.com/google/gopacket/tcpassembly"
"log"
"time"
)
Expand Down
10 changes: 5 additions & 5 deletions examples/synscan/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"net"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/examples/util"
"github.com/meterup/gopacket/layers"
"github.com/meterup/gopacket/pcap"
"github.com/meterup/gopacket/routing"
"github.com/google/gopacket"
"github.com/google/gopacket/examples/util"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
"github.com/google/gopacket/routing"
)

// scanner handles scanning a single IP address.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/meterup/gopacket
module github.com/google/gopacket

go 1.12

Expand Down
4 changes: 2 additions & 2 deletions ip4defrag/defrag.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"sync"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/layers"
"github.com/google/gopacket"
"github.com/google/gopacket/layers"
)

// Quick and Easy to use debug code to trace
Expand Down
6 changes: 3 additions & 3 deletions ip4defrag/defrag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"testing"
"time"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/bytediff"
"github.com/meterup/gopacket/layers"
"github.com/google/gopacket"
"github.com/google/gopacket/bytediff"
"github.com/google/gopacket/layers"
)

func TestNotFrag(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion layers/arp.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"errors"
"fmt"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// Potential values for ARP.Operation.
Expand Down
2 changes: 1 addition & 1 deletion layers/asf.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"encoding/binary"
"fmt"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion layers/asf_presencepong.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"encoding/binary"
"fmt"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion layers/asf_presencepong_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"encoding/hex"
"testing"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

func TestASFPresencePongDecodeFromBytes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion layers/asf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"encoding/hex"
"testing"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

func TestASFDecodeFromBytes(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion layers/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package layers

import (
"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// BaseLayer is a convenience struct which implements the LayerData and
Expand Down
2 changes: 1 addition & 1 deletion layers/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ package layers
import (
"testing"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

func checkLayers(p gopacket.Packet, want []gopacket.LayerType, t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion layers/bfd.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"encoding/binary"
"errors"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// BFD Control Packet Format
Expand Down
2 changes: 1 addition & 1 deletion layers/bfd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
package layers

import (
"github.com/meterup/gopacket"
"github.com/google/gopacket"
"reflect"
"testing"
)
Expand Down
2 changes: 1 addition & 1 deletion layers/cdp.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"fmt"
"net"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// CDPTLVType is the type of each TLV value in a CiscoDiscovery packet.
Expand Down
2 changes: 1 addition & 1 deletion layers/ctp.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ package layers
import (
"encoding/binary"
"fmt"
"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// EthernetCTPFunction is the function code used by the EthernetCTP protocol to identify each
Expand Down
4 changes: 2 additions & 2 deletions layers/decode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"strings"
"testing"

"github.com/meterup/gopacket"
"github.com/meterup/gopacket/bytediff"
"github.com/google/gopacket"
"github.com/google/gopacket/bytediff"
)

var testSimpleTCPPacket = []byte{
Expand Down
2 changes: 1 addition & 1 deletion layers/dhcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net"
"testing"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

func TestDHCPv4EncodeRequest(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion layers/dhcpv4.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"fmt"
"net"

"github.com/meterup/gopacket"
"github.com/google/gopacket"
)

// DHCPOp rerprents a bootp operation
Expand Down
Loading

0 comments on commit 5fe7135

Please sign in to comment.