[tor-commits] [tor-fw-helper/master] Changed the import paths to reflect the move to the tpo repo.
yawning at torproject.org
yawning at torproject.org
Wed Aug 5 18:45:26 UTC 2015
commit 481599ee37dd3135c9e17d1df4810f36b4de4e3d
Author: Yawning Angel <yawning at schwanenlied.me>
Date: Wed Aug 5 18:45:01 2015 +0000
Changed the import paths to reflect the move to the tpo repo.
---
main.go | 226 --------------------------------------------
natclient/natclient.go | 6 +-
natclient/natpmp/client.go | 2 +-
natclient/upnp/client.go | 2 +-
natclient/upnp/ssdp.go | 2 +-
tor-fw-helper/main.go | 226 ++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 232 insertions(+), 232 deletions(-)
diff --git a/main.go b/main.go
deleted file mode 100644
index 5ee31fb..0000000
--- a/main.go
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
- * Copyright (c) 2010-2013, The Tor Project, Inc.
- * Copyright (c) 2014, The Tor Project, Inc.
- * See LICENSE for licensing information
- */
-
-// tor-fw-helper is a tool for opening firewalls with the various NAT traversal
-// mechanisms. This tool is designed as a drop in replacement for the orginal
-// C language tor-fw-helper, with less hard-to-audit library code, and the use
-// of a memory-safe language as design goals.
-package main
-
-import (
- "flag"
- "fmt"
- "os"
- "strconv"
- "strings"
-
- "github.com/yawning/tor-fw-helper/natclient"
-)
-
-const (
- // mappingDescr is the default mapping entry name.
- mappingDescr = "Tor relay"
-
- // mappingDuration is the default mapping duration. A value of 0 indicates
- // that the protocol implementation's safe default value is used.
- mappingDuration = 0
-
- versionString = "0.3"
-)
-
-type portPair struct {
- internal int
- external int
-}
-
-type forwardList []portPair
-
-func (l *forwardList) String() string {
- return fmt.Sprint(*l)
-}
-
-func (l *forwardList) Set(value string) error {
- var internal, external int
-
- split := strings.Split(value, ":")
- if len(split) != 2 {
- return fmt.Errorf("failed to parse '%s'", value)
- }
-
- // Internal port is required, so handle it first.
- tmp, err := strconv.ParseUint(split[1], 10, 16)
- if err != nil {
- return err
- }
- internal = int(tmp)
-
- // External port is optional.
- if split[0] == "" {
- // If missing, set to the same as internal.
- external = internal
- } else {
- tmp, err := strconv.ParseUint(split[0], 10, 16)
- if err != nil {
- return err
- }
- external = int(tmp)
- }
-
- *l = append(*l, portPair{internal, external})
- return nil
-}
-
-func usage() {
- fmt.Fprintf(os.Stderr, "%s usage:\n"+
- " [-h|--help]\n"+
- " [-T|--test-commandline]\n"+
- " [-v|--verbose]\n"+
- " [-g|--fetch-public-ip]\n"+
- " [-p|--forward-port ([<external port>]:<internal port>)]\n"+
- " [-d|--unforward-port ([<external port>]:<internal port>]\n"+
- " [-l|--list-ports]\n"+
- " [--protocol NAT-PMP,UPnP]\n", os.Args[0])
- os.Exit(1)
-}
-
-func main() {
- doHelp := false
- doTest := false
- isVerbose := false
- doFetchIP := false
- doList := false
- var portsToForward forwardList
- var portsToUnforward forwardList
- protocol := ""
-
- // So, the flag package kind of sucks and doesn't gracefully support the
- // concept of aliased flags when printing usage, which results in a
- // usage and help output that looks like crap. Fix this by ignoring the
- // flag package's built in usage support, and overriding Usage().
- flag.Usage = usage
- flag.BoolVar(&doHelp, "help", false, "")
- flag.BoolVar(&doHelp, "h", false, "")
- flag.BoolVar(&doTest, "test-commandline", false, "")
- flag.BoolVar(&doTest, "T", false, "")
- flag.BoolVar(&isVerbose, "verbose", false, "")
- flag.BoolVar(&isVerbose, "v", false, "")
- flag.BoolVar(&doFetchIP, "fetch-public-ip", false, "")
- flag.BoolVar(&doFetchIP, "g", false, "")
- flag.BoolVar(&doList, "list-ports", false, "")
- flag.BoolVar(&doList, "l", false, "")
- flag.StringVar(&protocol, "protocol", "", "")
- flag.Var(&portsToForward, "forward-port", "")
- flag.Var(&portsToForward, "p", "")
- flag.Var(&portsToUnforward, "unforward-port", "")
- flag.Var(&portsToUnforward, "d", "")
- flag.Parse()
-
- // Extra flag related handling.
- if doHelp || flag.NArg() > 0 {
- usage()
- }
- if isVerbose {
- // Dump information about how we were invoked.
- fmt.Fprintf(os.Stderr, "V: tor-fw-helper version %s\n"+
- "V: We were called with the following arguments:\n"+
- "V: verbose = %v, help = %v, fetch_public_ip = %v, "+
- "list_ports = %v, protocol = '%s'\n",
- versionString, isVerbose, doHelp, doFetchIP, doList, protocol)
-
- if len(portsToForward) > 0 {
- fmt.Fprintf(os.Stderr, "V: TCP forwarding:\n")
- for _, ent := range portsToForward {
- fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n",
- ent.external, ent.internal)
- }
- }
- if len(portsToUnforward) > 0 {
- fmt.Fprintf(os.Stderr, "V: Remove TCP forwarding:\n")
- for _, ent := range portsToUnforward {
- fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n",
- ent.external, ent.internal)
- }
- }
- }
- if doTest {
- // If the app is being called in test mode, dump the command line
- // arguments to a file.
- //
- // TODO: I have no idea why this exists, I'll add this later.
- fmt.Fprintf(os.Stderr, "E: --test-commandline not implemented yet\n")
- os.Exit(1)
- }
- if len(portsToForward) == 0 && !doFetchIP && !doList && len(portsToUnforward) == 0 {
- // Nothing to do, sad panda.
- fmt.Fprintf(os.Stderr, "E: We require a port to be forwarded/unforwarded, "+
- "fetch_public_ip request, or list_ports!\n")
- os.Exit(1)
- }
-
- // Discover/Initialize a compatible NAT traversal method.
- c, err := natclient.New(protocol, isVerbose)
- if err != nil {
- fmt.Fprintf(os.Stderr, "E: %s\n", err)
- os.Exit(1)
- }
- defer c.Close()
-
- // Forward some ports, the response is delivered over stdout in a
- // predefined format.
- for _, pair := range portsToForward {
- err = c.AddPortMapping(mappingDescr, pair.internal, pair.external, mappingDuration)
- if err != nil {
- c.Vlogf("AddPortMapping() failed: %s\n", err)
- fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d FAIL\n", pair.external, pair.internal)
- } else {
- c.Vlogf("AddPortMapping() succeded\n")
- fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d SUCCESS\n", pair.external, pair.internal)
- }
- os.Stdout.Sync()
- }
-
- // Unforward some ports, the response is delivered over stdout in a
- // predefined format similar to forwarding.
- for _, pair := range portsToUnforward {
- err := c.DeletePortMapping(pair.internal, pair.external)
- if err != nil {
- c.Vlogf("DeletePortMapping() failed: %s\n", err)
- fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d FAIL\n", pair.external, pair.internal)
- } else {
- c.Vlogf("DeletePortMapping() succeded\n")
- fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d SUCCESS\n", pair.external, pair.internal)
- }
- os.Stdout.Sync()
- }
-
- // Get the external IP.
- if doFetchIP {
- ip, err := c.GetExternalIPAddress()
- if err != nil {
- fmt.Fprintf(os.Stderr, "E: Failed to query the external IP address: %s\n", err)
- os.Exit(1)
- }
- fmt.Fprintf(os.Stderr, "tor-fw-helper: ExternalIPAddress = %s\n", ip)
- }
-
- // List the current mappings.
- if doList {
- ents, err := c.GetListOfPortMappings()
- if err != nil {
- fmt.Fprintf(os.Stderr, "E: Failed to query the list of mappings: %s\n", err)
- os.Exit(1)
- }
- fmt.Fprintf(os.Stderr, "tor-fw-helper: Current port forwarding mappings:\n")
- if len(ents) == 0 {
- fmt.Fprintf(os.Stderr, "tor-fw-helper: No entries found.\n")
- } else {
- for _, ent := range ents {
- fmt.Fprintf(os.Stderr, "tor-fw-helper: %s\n", ent)
- }
- }
- }
-}
diff --git a/natclient/natclient.go b/natclient/natclient.go
index ab3ef61..47a8cd9 100644
--- a/natclient/natclient.go
+++ b/natclient/natclient.go
@@ -10,9 +10,9 @@ package natclient
import (
"fmt"
- "github.com/yawning/tor-fw-helper/natclient/base"
- "github.com/yawning/tor-fw-helper/natclient/natpmp"
- "github.com/yawning/tor-fw-helper/natclient/upnp"
+ "git.torproject.org/tor-fw-helper.git/natclient/base"
+ "git.torproject.org/tor-fw-helper.git/natclient/natpmp"
+ "git.torproject.org/tor-fw-helper.git/natclient/upnp"
)
var factories = make(map[string]base.ClientFactory)
diff --git a/natclient/natpmp/client.go b/natclient/natpmp/client.go
index 966ab01..1a8c7e4 100644
--- a/natclient/natpmp/client.go
+++ b/natclient/natpmp/client.go
@@ -12,7 +12,7 @@ import (
"net"
"syscall"
- "github.com/yawning/tor-fw-helper/natclient/base"
+ "git.torproject.org/tor-fw-helper.git/natclient/base"
)
const (
diff --git a/natclient/upnp/client.go b/natclient/upnp/client.go
index 352531e..ab7987a 100644
--- a/natclient/upnp/client.go
+++ b/natclient/upnp/client.go
@@ -9,7 +9,7 @@ package upnp
import (
"net"
- "github.com/yawning/tor-fw-helper/natclient/base"
+ "git.torproject.org/tor-fw-helper.git/natclient/base"
)
const (
diff --git a/natclient/upnp/ssdp.go b/natclient/upnp/ssdp.go
index 06f2147..882cdf1 100644
--- a/natclient/upnp/ssdp.go
+++ b/natclient/upnp/ssdp.go
@@ -18,7 +18,7 @@ import (
"strings"
"time"
- "github.com/yawning/tor-fw-helper/natclient/upnp/httpu"
+ "git.torproject.org/tor-fw-helper.git/natclient/upnp/httpu"
)
const (
diff --git a/tor-fw-helper/main.go b/tor-fw-helper/main.go
new file mode 100644
index 0000000..f36225d
--- /dev/null
+++ b/tor-fw-helper/main.go
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 2010, Jacob Appelbaum, Steven J. Murdoch.
+ * Copyright (c) 2010-2013, The Tor Project, Inc.
+ * Copyright (c) 2014, The Tor Project, Inc.
+ * See LICENSE for licensing information
+ */
+
+// tor-fw-helper is a tool for opening firewalls with the various NAT traversal
+// mechanisms. This tool is designed as a drop in replacement for the orginal
+// C language tor-fw-helper, with less hard-to-audit library code, and the use
+// of a memory-safe language as design goals.
+package main
+
+import (
+ "flag"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+
+ "git.torproject.org/tor-fw-helper.git/natclient"
+)
+
+const (
+ // mappingDescr is the default mapping entry name.
+ mappingDescr = "Tor relay"
+
+ // mappingDuration is the default mapping duration. A value of 0 indicates
+ // that the protocol implementation's safe default value is used.
+ mappingDuration = 0
+
+ versionString = "0.3"
+)
+
+type portPair struct {
+ internal int
+ external int
+}
+
+type forwardList []portPair
+
+func (l *forwardList) String() string {
+ return fmt.Sprint(*l)
+}
+
+func (l *forwardList) Set(value string) error {
+ var internal, external int
+
+ split := strings.Split(value, ":")
+ if len(split) != 2 {
+ return fmt.Errorf("failed to parse '%s'", value)
+ }
+
+ // Internal port is required, so handle it first.
+ tmp, err := strconv.ParseUint(split[1], 10, 16)
+ if err != nil {
+ return err
+ }
+ internal = int(tmp)
+
+ // External port is optional.
+ if split[0] == "" {
+ // If missing, set to the same as internal.
+ external = internal
+ } else {
+ tmp, err := strconv.ParseUint(split[0], 10, 16)
+ if err != nil {
+ return err
+ }
+ external = int(tmp)
+ }
+
+ *l = append(*l, portPair{internal, external})
+ return nil
+}
+
+func usage() {
+ fmt.Fprintf(os.Stderr, "%s usage:\n"+
+ " [-h|--help]\n"+
+ " [-T|--test-commandline]\n"+
+ " [-v|--verbose]\n"+
+ " [-g|--fetch-public-ip]\n"+
+ " [-p|--forward-port ([<external port>]:<internal port>)]\n"+
+ " [-d|--unforward-port ([<external port>]:<internal port>]\n"+
+ " [-l|--list-ports]\n"+
+ " [--protocol NAT-PMP,UPnP]\n", os.Args[0])
+ os.Exit(1)
+}
+
+func main() {
+ doHelp := false
+ doTest := false
+ isVerbose := false
+ doFetchIP := false
+ doList := false
+ var portsToForward forwardList
+ var portsToUnforward forwardList
+ protocol := ""
+
+ // So, the flag package kind of sucks and doesn't gracefully support the
+ // concept of aliased flags when printing usage, which results in a
+ // usage and help output that looks like crap. Fix this by ignoring the
+ // flag package's built in usage support, and overriding Usage().
+ flag.Usage = usage
+ flag.BoolVar(&doHelp, "help", false, "")
+ flag.BoolVar(&doHelp, "h", false, "")
+ flag.BoolVar(&doTest, "test-commandline", false, "")
+ flag.BoolVar(&doTest, "T", false, "")
+ flag.BoolVar(&isVerbose, "verbose", false, "")
+ flag.BoolVar(&isVerbose, "v", false, "")
+ flag.BoolVar(&doFetchIP, "fetch-public-ip", false, "")
+ flag.BoolVar(&doFetchIP, "g", false, "")
+ flag.BoolVar(&doList, "list-ports", false, "")
+ flag.BoolVar(&doList, "l", false, "")
+ flag.StringVar(&protocol, "protocol", "", "")
+ flag.Var(&portsToForward, "forward-port", "")
+ flag.Var(&portsToForward, "p", "")
+ flag.Var(&portsToUnforward, "unforward-port", "")
+ flag.Var(&portsToUnforward, "d", "")
+ flag.Parse()
+
+ // Extra flag related handling.
+ if doHelp || flag.NArg() > 0 {
+ usage()
+ }
+ if isVerbose {
+ // Dump information about how we were invoked.
+ fmt.Fprintf(os.Stderr, "V: tor-fw-helper version %s\n"+
+ "V: We were called with the following arguments:\n"+
+ "V: verbose = %v, help = %v, fetch_public_ip = %v, "+
+ "list_ports = %v, protocol = '%s'\n",
+ versionString, isVerbose, doHelp, doFetchIP, doList, protocol)
+
+ if len(portsToForward) > 0 {
+ fmt.Fprintf(os.Stderr, "V: TCP forwarding:\n")
+ for _, ent := range portsToForward {
+ fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n",
+ ent.external, ent.internal)
+ }
+ }
+ if len(portsToUnforward) > 0 {
+ fmt.Fprintf(os.Stderr, "V: Remove TCP forwarding:\n")
+ for _, ent := range portsToUnforward {
+ fmt.Fprintf(os.Stderr, "V: External %v, Internal: %v\n",
+ ent.external, ent.internal)
+ }
+ }
+ }
+ if doTest {
+ // If the app is being called in test mode, dump the command line
+ // arguments to a file.
+ //
+ // TODO: I have no idea why this exists, I'll add this later.
+ fmt.Fprintf(os.Stderr, "E: --test-commandline not implemented yet\n")
+ os.Exit(1)
+ }
+ if len(portsToForward) == 0 && !doFetchIP && !doList && len(portsToUnforward) == 0 {
+ // Nothing to do, sad panda.
+ fmt.Fprintf(os.Stderr, "E: We require a port to be forwarded/unforwarded, "+
+ "fetch_public_ip request, or list_ports!\n")
+ os.Exit(1)
+ }
+
+ // Discover/Initialize a compatible NAT traversal method.
+ c, err := natclient.New(protocol, isVerbose)
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "E: %s\n", err)
+ os.Exit(1)
+ }
+ defer c.Close()
+
+ // Forward some ports, the response is delivered over stdout in a
+ // predefined format.
+ for _, pair := range portsToForward {
+ err = c.AddPortMapping(mappingDescr, pair.internal, pair.external, mappingDuration)
+ if err != nil {
+ c.Vlogf("AddPortMapping() failed: %s\n", err)
+ fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d FAIL\n", pair.external, pair.internal)
+ } else {
+ c.Vlogf("AddPortMapping() succeded\n")
+ fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-forward %d %d SUCCESS\n", pair.external, pair.internal)
+ }
+ os.Stdout.Sync()
+ }
+
+ // Unforward some ports, the response is delivered over stdout in a
+ // predefined format similar to forwarding.
+ for _, pair := range portsToUnforward {
+ err := c.DeletePortMapping(pair.internal, pair.external)
+ if err != nil {
+ c.Vlogf("DeletePortMapping() failed: %s\n", err)
+ fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d FAIL\n", pair.external, pair.internal)
+ } else {
+ c.Vlogf("DeletePortMapping() succeded\n")
+ fmt.Fprintf(os.Stdout, "tor-fw-helper tcp-unforward %d %d SUCCESS\n", pair.external, pair.internal)
+ }
+ os.Stdout.Sync()
+ }
+
+ // Get the external IP.
+ if doFetchIP {
+ ip, err := c.GetExternalIPAddress()
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "E: Failed to query the external IP address: %s\n", err)
+ os.Exit(1)
+ }
+ fmt.Fprintf(os.Stderr, "tor-fw-helper: ExternalIPAddress = %s\n", ip)
+ }
+
+ // List the current mappings.
+ if doList {
+ ents, err := c.GetListOfPortMappings()
+ if err != nil {
+ fmt.Fprintf(os.Stderr, "E: Failed to query the list of mappings: %s\n", err)
+ os.Exit(1)
+ }
+ fmt.Fprintf(os.Stderr, "tor-fw-helper: Current port forwarding mappings:\n")
+ if len(ents) == 0 {
+ fmt.Fprintf(os.Stderr, "tor-fw-helper: No entries found.\n")
+ } else {
+ for _, ent := range ents {
+ fmt.Fprintf(os.Stderr, "tor-fw-helper: %s\n", ent)
+ }
+ }
+ }
+}
More information about the tor-commits
mailing list