From 2c7838def2a1338443fd73835ac01019398b219b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 3 Sep 2019 19:36:44 +0200 Subject: move to go modules --- .gitignore | 2 +- Makefile | 51 +++++++++++++++++++ app/Makefile | 76 ----------------------------- app/anygone.go | 122 ---------------------------------------------- app/conf.go | 129 ------------------------------------------------- cmd/anygone/Makefile | 76 +++++++++++++++++++++++++++++ cmd/anygone/anygone.go | 122 ++++++++++++++++++++++++++++++++++++++++++++++ cmd/anygone/conf.go | 129 +++++++++++++++++++++++++++++++++++++++++++++++++ go.mod | 11 +++++ go.sum | 10 ++++ 10 files changed, 400 insertions(+), 328 deletions(-) create mode 100644 Makefile delete mode 100644 app/Makefile delete mode 100644 app/anygone.go delete mode 100644 app/conf.go create mode 100644 cmd/anygone/Makefile create mode 100644 cmd/anygone/anygone.go create mode 100644 cmd/anygone/conf.go create mode 100644 go.mod create mode 100644 go.sum diff --git a/.gitignore b/.gitignore index 56f7a36..5a81d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/app/anygone +/anygone coverage.out diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ddb58e1 --- /dev/null +++ b/Makefile @@ -0,0 +1,51 @@ +## +## Copyright (c) 2017 anygone contributors (see AUTHORS file) +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions are met: +## +## * Redistributions of source code must retain the above copyright notice, this +## list of conditions and the following disclaimer. +## +## * Redistributions in binary form must reproduce the above copyright notice, +## this list of conditions and the following disclaimer in the documentation +## and/or other materials provided with the distribution. +## +## * Neither the name of anygone nor the names of its +## contributors may be used to endorse or promote products derived from +## this software without specific prior written permission. +## +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +## + +GOCMD := go +ifdef GOROOT +GOCMD = $(GOROOT)/bin/go +endif + +EXECUTEABLE := anygone + +all: build +.PHONY: vet format build clean + +vet: + $(GOCMD) vet ./... + +format: + $(GOCMD) fmt ./... + +build: + $(GOCMD) build -o $(EXECUTEABLE) ./cmd/anygone + +clean: + rm -f $(EXECUTEABLE) diff --git a/app/Makefile b/app/Makefile deleted file mode 100644 index 92cb899..0000000 --- a/app/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -## -## Copyright (c) 2017 anygone contributors (see AUTHORS file) -## All rights reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are met: -## -## * Redistributions of source code must retain the above copyright notice, this -## list of conditions and the following disclaimer. -## -## * Redistributions in binary form must reproduce the above copyright notice, -## this list of conditions and the following disclaimer in the documentation -## and/or other materials provided with the distribution. -## -## * Neither the name of anygone nor the names of its -## contributors may be used to endorse or promote products derived from -## this software without specific prior written permission. -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -## - -GOCMD := go -ifdef GOROOT -GOCMD = $(GOROOT)/bin/go -endif -EXECUTEABLE := anygone - -LIBS := "go.anytun.org/anygone/satp" \ - "github.com/lab11/go-tuntap/tuntap" \ - "github.com/spf13/pflag" - -all: build test -.PHONY: vet format getlibs updatelibs build build-static test bench cover clean distclean - -vet: - $(GOCMD) vet - -format: - $(GOCMD) fmt - -getlibs: - @$(foreach lib,$(LIBS), echo "fetching lib: $(lib)"; $(GOCMD) get $(lib);) - -updatelibs: - @$(foreach lib,$(LIBS), echo "updating lib: $(lib)"; $(GOCMD) get -u $(lib);) - -build: getlibs - $(GOCMD) build -o $(EXECUTEABLE) - -build-static: getlibs - $(GOCMD) build -tags netgo -o $(EXECUTEABLE) - -test: - $(GOCMD) test - -bench: - @$(GOCMD) test -bench=. - -cover: - @$(GOCMD) test -coverprofile=coverage.out - @$(GOCMD) tool cover -html=coverage.out - -distclean: clean - rm -f $(EXECUTEABLE).8 - -clean: - rm -f $(EXECUTEABLE) diff --git a/app/anygone.go b/app/anygone.go deleted file mode 100644 index ce1734c..0000000 --- a/app/anygone.go +++ /dev/null @@ -1,122 +0,0 @@ -// -// Copyright (c) 2017 anygone contributors (see AUTHORS file) -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * Neither the name of anygone nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -package main - -import ( - "fmt" - "io/ioutil" - "log" - "os" - - "go.anytun.org/anygone/tuntap" -) - -var ( - al = log.New(os.Stdout, "[anygone]\t", log.LstdFlags) - adl = log.New(ioutil.Discard, "[anygone dbg]\t", log.LstdFlags) -) - -func init() { - // if _, exists := os.LookupEnv("ANYGONE_DEBUG"); exists { - adl.SetOutput(os.Stderr) - // } -} - -func main() { - cfg, err := NewConfig() - if err != nil { - fmt.Printf("Error while parsing commandline: %v\n\n", err) - cfg.PrintUsage() - os.Exit(2) - } - if cfg.Help { - cfg.PrintUsage() - os.Exit(0) - } - if cfg.Version { - cfg.PrintVersion() - os.Exit(0) - } - cfg.Dump() - - al.Println("just started...") - - dev, err := tuntap.NewDevice(cfg.DeviceType, cfg.DeviceName) - if err != nil { - al.Printf("Error while opening device: %v", err) - os.Exit(1) - } - al.Printf("Device '%s': opened", dev.Name()) - - if cfg.IFConfig.Valid { - if err = dev.AddAddress(cfg.IFConfig.Net); err != nil { - al.Printf("Error while configuring device: %v", err) - os.Exit(1) - } - al.Printf("Device '%s': added address %s", dev.Name(), cfg.IFConfig.Net.String()) - } - - if err = dev.SetMTU(1400); err != nil { // TODO: hardcoded value - al.Printf("Error while configuring device: %v", err) - os.Exit(1) - } - if err = dev.Up(); err != nil { - al.Printf("Error while configuring device: %v", err) - os.Exit(1) - } - - if cfg.PostUp != "" { - al.Printf("Device '%s': running post-up script: %s", dev.Name(), cfg.PostUp) - if err = dev.RunPostUp(cfg.PostUp); err != nil { - al.Printf("Error while running post-up script: %v", err) - os.Exit(1) - } - al.Printf("Device '%s': post-up script returned 0", dev.Name()) - } - - for { - pkt, err := dev.ReadPacket() - if err != nil { - al.Printf("Error while reading packet from device: %v", err) - os.Exit(1) - } - payload := "" - for i, b := range pkt.Packet { - if i == 0 { - payload = fmt.Sprintf("{0x%02X", b) - } else { - payload = payload + fmt.Sprintf(", 0x%02X", b) - } - } - payload = payload + "}" - adl.Printf("got packet: Type {0x%04X}, Payload %s", pkt.Protocol, payload) - } -} diff --git a/app/conf.go b/app/conf.go deleted file mode 100644 index 5066808..0000000 --- a/app/conf.go +++ /dev/null @@ -1,129 +0,0 @@ -// -// Copyright (c) 2017 anygone contributors (see AUTHORS file) -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, this -// list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// -// * Neither the name of anygone nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// - -package main - -import ( - "fmt" - "net" - "os" - "path/filepath" - "strings" - - "github.com/spf13/pflag" -) - -type IPAddrCIDR struct { - Net net.IPNet - Valid bool -} - -func (ipnet IPAddrCIDR) String() string { - if ipnet.Valid { - return ipnet.Net.String() - } - return "" -} - -func (ipnet *IPAddrCIDR) Set(value string) error { - ip, net, err := net.ParseCIDR(strings.TrimSpace(value)) - if err != nil { - return err - } - net.IP = ip - *ipnet = IPAddrCIDR{*net, true} - return nil -} - -func (*IPAddrCIDR) Type() string { - return "ipNet" -} - -type Config struct { - name string - flags *pflag.FlagSet - - Help bool - Version bool - DeviceName string - DeviceType string - IFConfig IPAddrCIDR - PostUp string -} - -func (cfg *Config) PrintUsage() { - cfg.flags.Usage() -} - -func (cfg *Config) PrintVersion() { - fmt.Println("anygone version 0.1") -} - -func (cfg *Config) Dump() { - fmt.Printf("Config: %+v\n", cfg) -} - -func (cfg *Config) parsePost() error { - extraArgs := cfg.flags.Args() - if len(extraArgs) > 0 { - return fmt.Errorf("unknown additional parameters (%s)", strings.Join(extraArgs, ", ")) - } - - if cfg.DeviceName == "" && cfg.DeviceType == "" { - cfg.DeviceType = "tun" - } - return nil -} - -func NewConfig() (cfg *Config, err error) { - cfg = &Config{} - cfg.name = filepath.Base(os.Args[0]) - cfg.flags = pflag.NewFlagSet(cfg.name, pflag.ContinueOnError) - cfg.flags.SetInterspersed(false) - cfg.flags.SortFlags = false - cfg.flags.Usage = func() { - fmt.Fprintf(os.Stderr, "Usage of %s:\n", cfg.name) - cfg.flags.PrintDefaults() - } - - cfg.flags.BoolVarP(&cfg.Help, "help", "h", false, "print this...") - cfg.flags.BoolVarP(&cfg.Version, "version", "v", false, "print version info and exit") - - cfg.flags.StringVarP(&cfg.DeviceName, "dev", "d", "", "device name") - cfg.flags.StringVarP(&cfg.DeviceType, "type", "t", "", "device type") - cfg.flags.VarP(&cfg.IFConfig, "ifconfig", "n", "the local address for the tun/tap device and the used prefix length") - cfg.flags.StringVarP(&cfg.PostUp, "post-up-script", "x", "", "script gets called after interface is created") - - if err = cfg.flags.Parse(os.Args[1:]); err != nil { - return - } - err = cfg.parsePost() - return -} diff --git a/cmd/anygone/Makefile b/cmd/anygone/Makefile new file mode 100644 index 0000000..92cb899 --- /dev/null +++ b/cmd/anygone/Makefile @@ -0,0 +1,76 @@ +## +## Copyright (c) 2017 anygone contributors (see AUTHORS file) +## All rights reserved. +## +## Redistribution and use in source and binary forms, with or without +## modification, are permitted provided that the following conditions are met: +## +## * Redistributions of source code must retain the above copyright notice, this +## list of conditions and the following disclaimer. +## +## * Redistributions in binary form must reproduce the above copyright notice, +## this list of conditions and the following disclaimer in the documentation +## and/or other materials provided with the distribution. +## +## * Neither the name of anygone nor the names of its +## contributors may be used to endorse or promote products derived from +## this software without specific prior written permission. +## +## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +## AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +## DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +## FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +## DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +## SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +## CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +## + +GOCMD := go +ifdef GOROOT +GOCMD = $(GOROOT)/bin/go +endif +EXECUTEABLE := anygone + +LIBS := "go.anytun.org/anygone/satp" \ + "github.com/lab11/go-tuntap/tuntap" \ + "github.com/spf13/pflag" + +all: build test +.PHONY: vet format getlibs updatelibs build build-static test bench cover clean distclean + +vet: + $(GOCMD) vet + +format: + $(GOCMD) fmt + +getlibs: + @$(foreach lib,$(LIBS), echo "fetching lib: $(lib)"; $(GOCMD) get $(lib);) + +updatelibs: + @$(foreach lib,$(LIBS), echo "updating lib: $(lib)"; $(GOCMD) get -u $(lib);) + +build: getlibs + $(GOCMD) build -o $(EXECUTEABLE) + +build-static: getlibs + $(GOCMD) build -tags netgo -o $(EXECUTEABLE) + +test: + $(GOCMD) test + +bench: + @$(GOCMD) test -bench=. + +cover: + @$(GOCMD) test -coverprofile=coverage.out + @$(GOCMD) tool cover -html=coverage.out + +distclean: clean + rm -f $(EXECUTEABLE).8 + +clean: + rm -f $(EXECUTEABLE) diff --git a/cmd/anygone/anygone.go b/cmd/anygone/anygone.go new file mode 100644 index 0000000..ce1734c --- /dev/null +++ b/cmd/anygone/anygone.go @@ -0,0 +1,122 @@ +// +// Copyright (c) 2017 anygone contributors (see AUTHORS file) +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// * Neither the name of anygone nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +package main + +import ( + "fmt" + "io/ioutil" + "log" + "os" + + "go.anytun.org/anygone/tuntap" +) + +var ( + al = log.New(os.Stdout, "[anygone]\t", log.LstdFlags) + adl = log.New(ioutil.Discard, "[anygone dbg]\t", log.LstdFlags) +) + +func init() { + // if _, exists := os.LookupEnv("ANYGONE_DEBUG"); exists { + adl.SetOutput(os.Stderr) + // } +} + +func main() { + cfg, err := NewConfig() + if err != nil { + fmt.Printf("Error while parsing commandline: %v\n\n", err) + cfg.PrintUsage() + os.Exit(2) + } + if cfg.Help { + cfg.PrintUsage() + os.Exit(0) + } + if cfg.Version { + cfg.PrintVersion() + os.Exit(0) + } + cfg.Dump() + + al.Println("just started...") + + dev, err := tuntap.NewDevice(cfg.DeviceType, cfg.DeviceName) + if err != nil { + al.Printf("Error while opening device: %v", err) + os.Exit(1) + } + al.Printf("Device '%s': opened", dev.Name()) + + if cfg.IFConfig.Valid { + if err = dev.AddAddress(cfg.IFConfig.Net); err != nil { + al.Printf("Error while configuring device: %v", err) + os.Exit(1) + } + al.Printf("Device '%s': added address %s", dev.Name(), cfg.IFConfig.Net.String()) + } + + if err = dev.SetMTU(1400); err != nil { // TODO: hardcoded value + al.Printf("Error while configuring device: %v", err) + os.Exit(1) + } + if err = dev.Up(); err != nil { + al.Printf("Error while configuring device: %v", err) + os.Exit(1) + } + + if cfg.PostUp != "" { + al.Printf("Device '%s': running post-up script: %s", dev.Name(), cfg.PostUp) + if err = dev.RunPostUp(cfg.PostUp); err != nil { + al.Printf("Error while running post-up script: %v", err) + os.Exit(1) + } + al.Printf("Device '%s': post-up script returned 0", dev.Name()) + } + + for { + pkt, err := dev.ReadPacket() + if err != nil { + al.Printf("Error while reading packet from device: %v", err) + os.Exit(1) + } + payload := "" + for i, b := range pkt.Packet { + if i == 0 { + payload = fmt.Sprintf("{0x%02X", b) + } else { + payload = payload + fmt.Sprintf(", 0x%02X", b) + } + } + payload = payload + "}" + adl.Printf("got packet: Type {0x%04X}, Payload %s", pkt.Protocol, payload) + } +} diff --git a/cmd/anygone/conf.go b/cmd/anygone/conf.go new file mode 100644 index 0000000..5066808 --- /dev/null +++ b/cmd/anygone/conf.go @@ -0,0 +1,129 @@ +// +// Copyright (c) 2017 anygone contributors (see AUTHORS file) +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// * Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// * Neither the name of anygone nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// + +package main + +import ( + "fmt" + "net" + "os" + "path/filepath" + "strings" + + "github.com/spf13/pflag" +) + +type IPAddrCIDR struct { + Net net.IPNet + Valid bool +} + +func (ipnet IPAddrCIDR) String() string { + if ipnet.Valid { + return ipnet.Net.String() + } + return "" +} + +func (ipnet *IPAddrCIDR) Set(value string) error { + ip, net, err := net.ParseCIDR(strings.TrimSpace(value)) + if err != nil { + return err + } + net.IP = ip + *ipnet = IPAddrCIDR{*net, true} + return nil +} + +func (*IPAddrCIDR) Type() string { + return "ipNet" +} + +type Config struct { + name string + flags *pflag.FlagSet + + Help bool + Version bool + DeviceName string + DeviceType string + IFConfig IPAddrCIDR + PostUp string +} + +func (cfg *Config) PrintUsage() { + cfg.flags.Usage() +} + +func (cfg *Config) PrintVersion() { + fmt.Println("anygone version 0.1") +} + +func (cfg *Config) Dump() { + fmt.Printf("Config: %+v\n", cfg) +} + +func (cfg *Config) parsePost() error { + extraArgs := cfg.flags.Args() + if len(extraArgs) > 0 { + return fmt.Errorf("unknown additional parameters (%s)", strings.Join(extraArgs, ", ")) + } + + if cfg.DeviceName == "" && cfg.DeviceType == "" { + cfg.DeviceType = "tun" + } + return nil +} + +func NewConfig() (cfg *Config, err error) { + cfg = &Config{} + cfg.name = filepath.Base(os.Args[0]) + cfg.flags = pflag.NewFlagSet(cfg.name, pflag.ContinueOnError) + cfg.flags.SetInterspersed(false) + cfg.flags.SortFlags = false + cfg.flags.Usage = func() { + fmt.Fprintf(os.Stderr, "Usage of %s:\n", cfg.name) + cfg.flags.PrintDefaults() + } + + cfg.flags.BoolVarP(&cfg.Help, "help", "h", false, "print this...") + cfg.flags.BoolVarP(&cfg.Version, "version", "v", false, "print version info and exit") + + cfg.flags.StringVarP(&cfg.DeviceName, "dev", "d", "", "device name") + cfg.flags.StringVarP(&cfg.DeviceType, "type", "t", "", "device type") + cfg.flags.VarP(&cfg.IFConfig, "ifconfig", "n", "the local address for the tun/tap device and the used prefix length") + cfg.flags.StringVarP(&cfg.PostUp, "post-up-script", "x", "", "script gets called after interface is created") + + if err = cfg.flags.Parse(os.Args[1:]); err != nil { + return + } + err = cfg.parsePost() + return +} diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..0f78508 --- /dev/null +++ b/go.mod @@ -0,0 +1,11 @@ +module go.anytun.org/anygone + +go 1.12 + +require ( + github.com/lab11/go-tuntap v0.0.0-20180910222439-496040da82ee + github.com/spf13/pflag v1.0.3 + github.com/vishvananda/netlink v1.0.0 + github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect + golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..c8d99eb --- /dev/null +++ b/go.sum @@ -0,0 +1,10 @@ +github.com/lab11/go-tuntap v0.0.0-20180910222439-496040da82ee h1:hJNNA40qYu836xKUyNb/uIY9R5W00X1V68E1fnhm2Jc= +github.com/lab11/go-tuntap v0.0.0-20180910222439-496040da82ee/go.mod h1:2BpaPxCwbjMQdh1wZVf32VakuZh8dcOy3f4pOkXPYaQ= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM= +github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= +github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f h1:nBX3nTcmxEtHSERBJaIo1Qa26VwRaopnZmfDQUXsF4I= +github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= +golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 h1:tdsQdquKbTNMsSZLqnLELJGzCANp9oXhu6zFBW6ODx4= +golang.org/x/sys v0.0.0-20190902133755-9109b7679e13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -- cgit v1.2.3