From 129edf036af97f25ccbc1c227c16e767c4e6b6a2 Mon Sep 17 00:00:00 2001 From: wencaiwulue <895703375@qq.com> Date: Sun, 5 Sep 2021 11:15:59 +0800 Subject: [PATCH] remove useless code --- pkg/main.go | 2 +- pkg/peer.go | 164 ---------------------------------------------------- 2 files changed, 1 insertion(+), 165 deletions(-) delete mode 100644 pkg/peer.go diff --git a/pkg/main.go b/pkg/main.go index df179dd6..d67a36e8 100644 --- a/pkg/main.go +++ b/pkg/main.go @@ -41,6 +41,7 @@ func init() { flag.StringVar(&kubeconfigpath, "kubeconfig", clientcmd.RecommendedHomeFile, "kubeconfig") flag.StringVar(&namespace, "namespace", "", "namespace") flag.StringVar(&services, "services", "", "services") + flag.BoolVar(&gost.Debug, "debug", false, "true/false") flag.Parse() log.Printf("kubeconfig path: %s, namespace: %s, serivces: %s\n", kubeconfigpath, namespace, services) var err error @@ -132,7 +133,6 @@ func prepare() { baseCfg.ServeNodes = fmt.Sprintf("tun://:8421/127.0.0.1:8421?net=%s&route=%s", tunIp.String(), strings.Join(list, ",")) log.Info("your ip is " + tunIp.String()) - gost.Debug = true if util.IsWindows() { exe.InstallTunTapDriver() diff --git a/pkg/peer.go b/pkg/peer.go deleted file mode 100644 index 10371177..00000000 --- a/pkg/peer.go +++ /dev/null @@ -1,164 +0,0 @@ -package main - -import ( - "bufio" - "bytes" - "encoding/json" - "io" - "io/ioutil" - "kubevpn/gost" - "strconv" - "strings" - "time" -) - -type peerConfig struct { - Strategy string `json:"strategy"` - MaxFails int `json:"max_fails"` - FailTimeout time.Duration - period time.Duration // the period for live reloading - Nodes []string `json:"nodes"` - group *gost.NodeGroup - baseNodes []gost.Node - stopped chan struct{} -} - -func newPeerConfig() *peerConfig { - return &peerConfig{ - stopped: make(chan struct{}), - } -} - -func (cfg *peerConfig) Validate() { -} - -func (cfg *peerConfig) Reload(r io.Reader) error { - if cfg.Stopped() { - return nil - } - - if err := cfg.parse(r); err != nil { - return err - } - cfg.Validate() - - group := cfg.group - group.SetSelector( - nil, - gost.WithFilter( - &gost.FailFilter{ - MaxFails: cfg.MaxFails, - FailTimeout: cfg.FailTimeout, - }, - &gost.InvalidFilter{}, - ), - gost.WithStrategy(gost.NewStrategy(cfg.Strategy)), - ) - - gNodes := cfg.baseNodes - nid := len(gNodes) + 1 - for _, s := range cfg.Nodes { - nodes, err := parseChainNode(s) - if err != nil { - return err - } - - for i := range nodes { - nodes[i].ID = nid - nid++ - } - - gNodes = append(gNodes, nodes...) - } - - nodes := group.SetNodes(gNodes...) - for _, node := range nodes[len(cfg.baseNodes):] { - if node.Bypass != nil { - node.Bypass.Stop() // clear the old nodes - } - } - - return nil -} - -func (cfg *peerConfig) parse(r io.Reader) error { - data, err := ioutil.ReadAll(r) - if err != nil { - return err - } - - // compatible with JSON format - if err := json.NewDecoder(bytes.NewReader(data)).Decode(cfg); err == nil { - return nil - } - - split := func(line string) []string { - if line == "" { - return nil - } - if n := strings.IndexByte(line, '#'); n >= 0 { - line = line[:n] - } - line = strings.Replace(line, "\t", " ", -1) - line = strings.TrimSpace(line) - - var ss []string - for _, s := range strings.Split(line, " ") { - if s = strings.TrimSpace(s); s != "" { - ss = append(ss, s) - } - } - return ss - } - - cfg.Nodes = nil - scanner := bufio.NewScanner(bytes.NewReader(data)) - for scanner.Scan() { - line := scanner.Text() - ss := split(line) - if len(ss) < 2 { - continue - } - - switch ss[0] { - case "strategy": - cfg.Strategy = ss[1] - case "max_fails": - cfg.MaxFails, _ = strconv.Atoi(ss[1]) - case "fail_timeout": - cfg.FailTimeout, _ = time.ParseDuration(ss[1]) - case "reload": - cfg.period, _ = time.ParseDuration(ss[1]) - case "peer": - cfg.Nodes = append(cfg.Nodes, ss[1]) - } - } - - return scanner.Err() -} - -func (cfg *peerConfig) Period() time.Duration { - if cfg.Stopped() { - return -1 - } - return cfg.period -} - -// Stop stops reloading. -func (cfg *peerConfig) Stop() { - select { - case <-cfg.stopped: - default: - close(cfg.stopped) - } -} - -// Stopped checks whether the reloader is stopped. -func (cfg *peerConfig) Stopped() bool { - select { - case <-cfg.stopped: - return true - default: - return false - } -}