user : remove unused flag nosearch .

Set the default `--map-size` to 5120KB. Signed-off-by: cfc4n <cfc4n.cs@gmail.com>
gojue · Dec 2, 2023 · 4625226 · 4625226
1 parent cc75615
commit 4625226
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/cli/cmd/global.go b/cli/cmd/global.go
@@ -35,7 +35,6 @@ type GlobalFlags struct {
 	Debug      bool
 	Pid        uint64 // PID
 	Uid        uint64 // UID
-	NoSearch   bool   // No lib search
 	LoggerAddr string // save file
 	mapSizeKB  int    // ebpf map size per CPU
 	addrType   uint8  // 0:stdout, 1:file, 2:tcp
@@ -64,11 +63,6 @@ func getGlobalConf(command *cobra.Command) (conf GlobalFlags, err error) {
 		return
 	}
 
-	conf.NoSearch, err = command.Flags().GetBool("nosearch")
-	if err != nil {
-		return
-	}
-
 	conf.mapSizeKB, err = command.Flags().GetInt("map-size")
 	if err != nil {
 		return

diff --git a/cli/cmd/gotls.go b/cli/cmd/gotls.go
@@ -89,7 +89,6 @@ func goTLSCommandFunc(command *cobra.Command, args []string) {
 	conf.SetDebug(gConf.Debug)
 	conf.SetHex(gConf.IsHex)
 	conf.SetPerCpuMapSize(gConf.mapSizeKB)
-	//conf.SetNoSearch(gConf.NoSearch)
 
 	err = conf.Check()
 

diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -90,10 +90,9 @@ func init() {
 	// Cobra also supports local flags, which will only run
 	// when this action is called directly.
 	//rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-	rootCmd.PersistentFlags().BoolVarP(&globalFlags.Debug, "debug", "d", false, "enable debug logging")
+	rootCmd.PersistentFlags().BoolVarP(&globalFlags.Debug, "debug", "d", false, "enable debug logging.(coming soon)")
 	rootCmd.PersistentFlags().BoolVar(&globalFlags.IsHex, "hex", false, "print byte strings as hex encoded strings")
-	rootCmd.PersistentFlags().BoolVar(&globalFlags.NoSearch, "nosearch", false, "no lib search")
-	rootCmd.PersistentFlags().IntVar(&globalFlags.mapSizeKB, "map-size", 10240, "eBPF map size per CPU,for events buffer. default:10240. (KB)")
+	rootCmd.PersistentFlags().IntVar(&globalFlags.mapSizeKB, "map-size", 1024*5, "eBPF map size per CPU,for events buffer. default:5120. (KB)")
 	rootCmd.PersistentFlags().Uint64VarP(&globalFlags.Pid, "pid", "p", defaultPid, "if pid is 0 then we target all pids")
 	rootCmd.PersistentFlags().Uint64VarP(&globalFlags.Uid, "uid", "u", defaultUid, "if uid is 0 then we target all users")
 	rootCmd.PersistentFlags().StringVarP(&globalFlags.LoggerAddr, "log-addr", "l", "", "-l /tmp/ecapture.log or -l tcp://127.0.0.1:8080")

diff --git a/user/config/common_androidgki.go b/user/config/common_androidgki.go
@@ -17,6 +17,10 @@
 
 package config
 
+import (
+	"os"
+)
+
 // https://source.android.com/devices/architecture/vndk/linker-namespace
 var (
 	default_so_paths = []string{

diff --git a/user/config/config_nspr_linux.go b/user/config/config_nspr_linux.go
@@ -36,11 +36,6 @@ func (nc *NsprConfig) Check() error {
 		return nil
 	}
 	/*
-		if nc.NoSearch {
-			return errors.New("NoSearch requires specifying lib path")
-		}
-
-
 		//如果配置 Curlpath的地址，判断文件是否存在，不存在则直接返回
 		if nc.Firefoxpath != "" || len(strings.TrimSpace(nc.Firefoxpath)) > 0 {
 			_, e := os.Stat(nc.Firefoxpath)