Skip to content

Commit

Permalink
Fixed windows compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Reimerink committed Mar 20, 2022
1 parent 20b009a commit 6c51465
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
edb
main
dist/
.envrc
6 changes: 4 additions & 2 deletions cmd/capctx/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/cilium/ebpf/perf"
"github.com/dylandreimerink/mimic"
"github.com/spf13/cobra"
"golang.org/x/sys/unix"

_ "unsafe"
)
Expand Down Expand Up @@ -485,7 +484,7 @@ func instrumentProgram(prog *ebpf.ProgramSpec) error {
// Load map ptr into R2
asm.LoadMapPtr(asm.R2, 0).WithReference(feedbackMap),
// Set flags to BPF_F_CURRENT_CPU
asm.LoadImm(asm.R3, unix.BPF_F_CURRENT_CPU, asm.DWord),
asm.LoadImm(asm.R3, BPF_F_CURRENT_CPU, asm.DWord),
// Load ptr to start of map value
asm.LoadMem(asm.R4, asm.R10, bufferStartPtr, asm.DWord),
// // Load end of buffer
Expand Down Expand Up @@ -634,3 +633,6 @@ func instrumentProgram(prog *ebpf.ProgramSpec) error {

return nil
}

// Copied from sys/unix
const BPF_F_CURRENT_CPU = 0xffffffff
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/c-bata/go-prompt v0.2.6
github.com/cilium/ebpf v0.8.0
github.com/davecgh/go-spew v1.1.1
github.com/dylandreimerink/mimic v0.0.6
github.com/dylandreimerink/mimic v0.0.8
github.com/emicklei/dot v0.16.0
github.com/go-delve/delve v1.8.0
github.com/google/gopacket v1.1.19
Expand All @@ -20,7 +20,6 @@ require (
github.com/spf13/cobra v1.3.0
github.com/vishvananda/netlink v1.1.0
golang.org/x/exp v0.0.0-20220318154914-8dddf5d87bd8
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d
)

require (
Expand All @@ -37,5 +36,6 @@ require (
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect
golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect
golang.org/x/text v0.3.7 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ github.com/dylandreimerink/ebpf v0.8.1-0.20220304200500-9aa26fe85b03 h1:lh/MFjBh
github.com/dylandreimerink/ebpf v0.8.1-0.20220304200500-9aa26fe85b03/go.mod h1:f5zLIM0FSNuAkSyLAN7X+Hy6yznlF1mNiWUMfxMtrgk=
github.com/dylandreimerink/gopacket v1.1.20-0.20220126223506-0d3623bffc1f h1:bFrU1hXZFhi71fcUwZ6uh1mjh1YmBYFF7NfYdvXFnI8=
github.com/dylandreimerink/gopacket v1.1.20-0.20220126223506-0d3623bffc1f/go.mod h1:riddUzxTSBpJXk3qBHtYr4qOhFhT6k/1c0E3qkQjQpA=
github.com/dylandreimerink/mimic v0.0.6 h1:GR7ZOVUxNHjgUfADAMOzcvae9LeopmliWeJTF3yB0Lo=
github.com/dylandreimerink/mimic v0.0.6/go.mod h1:cGJE+zjVU4x75ggAgKpcTSJwaprVStiy3sVycuA7vLY=
github.com/dylandreimerink/mimic v0.0.8 h1:e+i06pn4JbMFzEBD32XiphtiNdsbSKlTaUES0Wujk3k=
github.com/dylandreimerink/mimic v0.0.8/go.mod h1:cGJE+zjVU4x75ggAgKpcTSJwaprVStiy3sVycuA7vLY=
github.com/emicklei/dot v0.16.0 h1:7PseyizTgeQ/aSF1eo4LcEfWlQSlzamFZpzY/nMB9EY=
github.com/emicklei/dot v0.16.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
Expand Down

0 comments on commit 6c51465

Please sign in to comment.