Skip to content

Commit a519cab

Browse files
committed
Replace github.com/google/gopacket with github.com/gopacket/gopacket
1 parent be44653 commit a519cab

9 files changed

Lines changed: 27 additions & 23 deletions

File tree

services/cmd/assembler/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"tulip/pkg/assembler"
3030
"tulip/pkg/db"
3131

32-
"github.com/google/gopacket"
33-
"github.com/google/gopacket/layers"
34-
"github.com/google/gopacket/pcapgo"
32+
"github.com/gopacket/gopacket"
33+
"github.com/gopacket/gopacket/layers"
34+
"github.com/gopacket/gopacket/pcapgo"
3535
"github.com/lmittmann/tint"
3636
"github.com/spf13/cobra"
3737
"github.com/spf13/viper"

services/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ go 1.24.4
99
require (
1010
github.com/andybalholm/brotli v1.2.0
1111
github.com/flier/gohs v1.2.3
12-
github.com/google/gopacket v1.1.19
12+
github.com/gopacket/gopacket v1.4.0
1313
github.com/joho/godotenv v1.5.1
1414
github.com/labstack/echo/v4 v4.13.4
1515
github.com/lmittmann/tint v1.1.2

services/go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,6 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
297297
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
298298
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
299299
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
300-
github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
301-
github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
302300
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
303301
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
304302
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -315,6 +313,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
315313
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
316314
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
317315
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
316+
github.com/gopacket/gopacket v1.4.0 h1:cr1OlFpzksCkZHNO0eLjaSSOrMQnpPXg0j6qHIY3y2U=
317+
github.com/gopacket/gopacket v1.4.0/go.mod h1:EpvsxINeehp5qj4YMKMLf2/dekdhKn2IIAO/ZOifS7o=
318318
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
319319
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
320320
github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s=
@@ -631,6 +631,10 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
631631
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
632632
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
633633
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
634+
github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
635+
github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
636+
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg=
637+
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0=
634638
github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
635639
github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
636640
github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY=

services/pkg/assembler/assembler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"time"
2121
"tulip/pkg/db"
2222

23-
"github.com/google/gopacket"
24-
"github.com/google/gopacket/ip4defrag"
25-
"github.com/google/gopacket/layers"
26-
"github.com/google/gopacket/reassembly"
23+
"github.com/gopacket/gopacket"
24+
"github.com/gopacket/gopacket/ip4defrag"
25+
"github.com/gopacket/gopacket/layers"
26+
"github.com/gopacket/gopacket/reassembly"
2727
)
2828

2929
type TcpAssembler = reassembly.Assembler

services/pkg/assembler/assembler_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"testing"
1010
"tulip/pkg/db"
1111

12-
"github.com/google/gopacket"
13-
"github.com/google/gopacket/ip4defrag"
14-
"github.com/google/gopacket/layers"
12+
"github.com/gopacket/gopacket"
13+
"github.com/gopacket/gopacket/ip4defrag"
14+
"github.com/gopacket/gopacket/layers"
1515
"github.com/stretchr/testify/assert"
1616
"github.com/stretchr/testify/require"
1717
"go.mongodb.org/mongo-driver/bson"

services/pkg/assembler/tcp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ package assembler
1414
import (
1515
"tulip/pkg/db"
1616

17-
"github.com/google/gopacket"
18-
"github.com/google/gopacket/layers"
19-
"github.com/google/gopacket/reassembly"
17+
"github.com/gopacket/gopacket"
18+
"github.com/gopacket/gopacket/layers"
19+
"github.com/gopacket/gopacket/reassembly"
2020
)
2121

2222
// TcpStreamFactory implements reassembly.StreamFactory for TCP streams.

services/pkg/assembler/udp.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"time"
1111
"tulip/pkg/db"
1212

13-
"github.com/google/gopacket"
14-
"github.com/google/gopacket/layers"
15-
"github.com/google/gopacket/reassembly"
13+
"github.com/gopacket/gopacket"
14+
"github.com/gopacket/gopacket/layers"
15+
"github.com/gopacket/gopacket/reassembly"
1616
)
1717

1818
// UdpStreamId uniquely identifies a bidirectional UDP stream

services/pkg/assembler/udp_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"bytes"
99
"testing"
1010

11-
"github.com/google/gopacket"
12-
"github.com/google/gopacket/layers"
11+
"github.com/gopacket/gopacket"
12+
"github.com/gopacket/gopacket/layers"
1313
"github.com/stretchr/testify/assert"
1414
)
1515

services/pkg/ingestor/rotating_writer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"path/filepath"
1515
"time"
1616

17-
"github.com/google/gopacket"
18-
"github.com/google/gopacket/pcapgo"
17+
"github.com/gopacket/gopacket"
18+
"github.com/gopacket/gopacket/pcapgo"
1919
)
2020

2121
// RotatingPCAPWriter captures packets from a network connection and writes them to PCAP files.

0 commit comments

Comments
 (0)