diff --git a/pkg/config.go b/pkg/config.go deleted file mode 100644 index 46877d11..00000000 --- a/pkg/config.go +++ /dev/null @@ -1,62 +0,0 @@ -package pkg - -import ( - "bufio" - "github.com/wencaiwulue/kubevpn/tun" - "net" - "os" - "strings" -) - -func parseIP(s string, port string) (ips []string) { - if s == "" { - return - } - if port == "" { - port = "8080" // default port - } - - file, err := os.Open(s) - if err != nil { - ss := strings.Split(s, ",") - for _, s := range ss { - s = strings.TrimSpace(s) - if s != "" { - // TODO: support IPv6 - if !strings.Contains(s, ":") { - s = s + ":" + port - } - ips = append(ips, s) - } - - } - return - } - - scanner := bufio.NewScanner(file) - for scanner.Scan() { - line := strings.TrimSpace(scanner.Text()) - if line == "" || strings.HasPrefix(line, "#") { - continue - } - if !strings.Contains(line, ":") { - line = line + ":" + port - } - ips = append(ips, line) - } - return -} - -func parseIPRoutes(routeStringList string) (routes []tun.IPRoute) { - if len(routeStringList) == 0 { - return - } - - ss := strings.Split(routeStringList, ",") - for _, s := range ss { - if _, inet, _ := net.ParseCIDR(strings.TrimSpace(s)); inet != nil { - routes = append(routes, tun.IPRoute{Dest: inet}) - } - } - return -} diff --git a/pkg/route.go b/pkg/route.go index ff9af11a..d21e0b25 100644 --- a/pkg/route.go +++ b/pkg/route.go @@ -7,6 +7,7 @@ import ( "github.com/wencaiwulue/kubevpn/core" "github.com/wencaiwulue/kubevpn/tun" "net" + "strings" ) type route struct { @@ -130,3 +131,17 @@ func (r *router) Close() error { } return r.server.Close() } + +func parseIPRoutes(routeStringList string) (routes []tun.IPRoute) { + if len(routeStringList) == 0 { + return + } + + ss := strings.Split(routeStringList, ",") + for _, s := range ss { + if _, inet, _ := net.ParseCIDR(strings.TrimSpace(s)); inet != nil { + routes = append(routes, tun.IPRoute{Dest: inet}) + } + } + return +}