Skip to content

Commit

Permalink
chore: rename ecapture module name. (#530)
Browse files Browse the repository at this point in the history
* chore: rename ecapture module name.

Signed-off-by: CFC4N <cfc4n.cs@gmail.com>

* makefile: ignore build `less_5_2` on aarch64

Constant replacement is not supported in the current version because the bpf_probe_read_user function which supports eBPF on the aarch architecture of the Linux Kernel, has been supported since version 5.5, which is higher than the constant replacement feature of cilium/ebpf

Signed-off-by: CFC4N <cfc4n.cs@gmail.com>

---------

Signed-off-by: CFC4N <cfc4n.cs@gmail.com>
  • Loading branch information
cfc4n committed Apr 22, 2024
1 parent 017f31d commit a8acece
Show file tree
Hide file tree
Showing 32 changed files with 74 additions and 71 deletions.
4 changes: 2 additions & 2 deletions cli/cmd/bash.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package cmd

import (
"context"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"
"github.com/spf13/cobra"
"log"
"os"
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/gnutls.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package cmd

import (
"context"
"ecapture/pkg/util/kernel"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"
"log"
"os"
"os/signal"
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/gotls.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"strings"
"syscall"

"ecapture/pkg/util/kernel"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"

"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/mysqld.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd

import (
"context"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"
"log"
"os"
"os/signal"
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/nss.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package cmd

import (
"context"
"ecapture/pkg/util/kernel"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"
"log"
"os"
"os/signal"
Expand Down
4 changes: 2 additions & 2 deletions cli/cmd/postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cmd

import (
"context"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"
"log"
"os"
"os/signal"
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package cmd

import (
"ecapture/cli/cobrautl"
"github.com/gojue/ecapture/cli/cobrautl"
"os"

"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions cli/cmd/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"sync"
"syscall"

"ecapture/pkg/util/kernel"
"ecapture/user/config"
"ecapture/user/module"
"github.com/gojue/ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/module"

"github.com/spf13/cobra"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package cli

import (
"ecapture/cli/cmd"
"github.com/gojue/ecapture/cli/cmd"
)

func Start() {
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 ecapture
module github.com/gojue/ecapture

go 1.21.5

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package main

import (
"ecapture/cli"
"ecapture/pkg/util/ebpf"
"ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/cli"
"github.com/gojue/ecapture/pkg/util/ebpf"
"github.com/gojue/ecapture/pkg/util/kernel"
_ "github.com/shuLhan/go-bindata" // add for bindata in Makefile
"log"
"runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/event_processor/base_event.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ package event_processor

import (
"bytes"
"ecapture/user/event"
"encoding/binary"
"fmt"
"github.com/gojue/ecapture/user/event"
)

type AttachType int64
Expand Down
2 changes: 1 addition & 1 deletion pkg/event_processor/iworker.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package event_processor

import (
"bytes"
"ecapture/user/event"
"encoding/hex"
"github.com/gojue/ecapture/user/event"
"sync/atomic"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/event_processor/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package event_processor

import (
"ecapture/user/event"
"fmt"
"github.com/gojue/ecapture/user/event"
"log"
"sync"
)
Expand Down
2 changes: 1 addition & 1 deletion user/config/iconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package config

import (
"ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/pkg/util/kernel"
"os"
)

Expand Down
8 changes: 4 additions & 4 deletions user/module/imodule.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ package module

import (
"context"
"ecapture/pkg/event_processor"
"ecapture/pkg/util/kernel"
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
"github.com/cilium/ebpf/perf"
"github.com/cilium/ebpf/ringbuf"
"github.com/gojue/ecapture/pkg/event_processor"
"github.com/gojue/ecapture/pkg/util/kernel"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"log"
"strings"
)
Expand Down
6 changes: 3 additions & 3 deletions user/module/probe_bash.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import (
"bytes"
"context"
"debug/elf"
"ecapture/assets"
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"log"
"math"

Expand Down
6 changes: 3 additions & 3 deletions user/module/probe_gnutls.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ package module
import (
"bytes"
"context"
"ecapture/assets"
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"log"
"math"
Expand Down
8 changes: 4 additions & 4 deletions user/module/probe_gotls.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"sync"
"time"

"ecapture/assets"
"ecapture/pkg/proc"
"ecapture/user/config"
"ecapture/user/event"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/pkg/proc"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"

"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_gotls_keylog.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
package module

import (
"ecapture/user/config"
"ecapture/user/event"
"errors"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"math"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_gotls_pcap.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math"
"net"

"ecapture/user/config"
"ecapture/user/event"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"

"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_gotls_text.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
package module

import (
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"math"
"strings"
Expand Down
6 changes: 3 additions & 3 deletions user/module/probe_mysqld.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ package module
import (
"bytes"
"context"
"ecapture/assets"
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"log"
"math"
Expand Down
6 changes: 3 additions & 3 deletions user/module/probe_nspr.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ package module
import (
"bytes"
"context"
"ecapture/assets"
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"log"
"math"
Expand Down
8 changes: 4 additions & 4 deletions user/module/probe_openssl.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"sync"
"time"

"ecapture/assets"
"ecapture/pkg/util/hkdf"
"ecapture/user/config"
"ecapture/user/event"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/pkg/util/hkdf"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"

"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_openssl_keylog.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
package module

import (
"ecapture/user/config"
"ecapture/user/event"
"errors"
"fmt"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"math"
"path"
Expand Down
2 changes: 1 addition & 1 deletion user/module/probe_openssl_lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package module

import (
"debug/elf"
"ecapture/user/config"
"fmt"
"github.com/gojue/ecapture/user/config"
"os"
"regexp"
"strings"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_openssl_pcap.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path"
"strings"

"ecapture/user/config"
"ecapture/user/event"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"

"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_openssl_text.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package module

import (
"ecapture/user/config"
"ecapture/user/event"
"errors"
"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"golang.org/x/sys/unix"
"math"
"os"
Expand Down
4 changes: 2 additions & 2 deletions user/module/probe_pcap.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"sync"
"time"

"ecapture/pkg/util/ethernet"
"ecapture/user/event"
"github.com/gojue/ecapture/pkg/util/ethernet"
"github.com/gojue/ecapture/user/event"

"github.com/cilium/ebpf"
manager "github.com/gojue/ebpfmanager"
Expand Down
6 changes: 3 additions & 3 deletions user/module/probe_postgres.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ package module
import (
"bytes"
"context"
"ecapture/assets"
"ecapture/user/config"
"ecapture/user/event"
"fmt"
"github.com/gojue/ecapture/assets"
"github.com/gojue/ecapture/user/config"
"github.com/gojue/ecapture/user/event"
"log"
"math"
"os"
Expand Down
Loading

0 comments on commit a8acece

Please sign in to comment.