From f965f41b6e8d177f4f06a8421ee071350813a1ac Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 17 Feb 2015 13:10:11 +0100 Subject: [PATCH] p2p/nat: switch to github.com/huin/goupnp My temporary fix was merged upstream. --- Godeps/Godeps.json | 8 ++++---- .../src/github.com/{fjl => huin}/goupnp/LICENSE | 0 .../src/github.com/{fjl => huin}/goupnp/README.md | 2 +- .../cmd/example_httpu_serving/example_httpu_serving.go | 2 +- .../example_internetgateway1.go | 2 +- .../goupnp/dcps/internetgateway1/internetgateway1.go | 4 ++-- .../goupnp/dcps/internetgateway2/internetgateway2.go | 4 ++-- .../src/github.com/{fjl => huin}/goupnp/device.go | 4 ++-- .../github.com/{fjl => huin}/goupnp/example/example.go | 2 +- .../{fjl => huin}/goupnp/example/example_test.go | 4 ++-- .../{fjl => huin}/goupnp/gotasks/specgen_task.go | 10 +++++----- .../src/github.com/{fjl => huin}/goupnp/goupnp.go | 10 +++++----- .../src/github.com/{fjl => huin}/goupnp/httpu/httpu.go | 0 .../src/github.com/{fjl => huin}/goupnp/httpu/serve.go | 0 .../src/github.com/{fjl => huin}/goupnp/scpd/scpd.go | 0 .../github.com/{fjl => huin}/goupnp/service_client.go | 3 +-- .../src/github.com/{fjl => huin}/goupnp/soap/soap.go | 0 .../github.com/{fjl => huin}/goupnp/soap/soap_test.go | 0 .../src/github.com/{fjl => huin}/goupnp/soap/types.go | 0 .../github.com/{fjl => huin}/goupnp/soap/types_test.go | 0 .../github.com/{fjl => huin}/goupnp/ssdp/registry.go | 2 +- .../src/github.com/{fjl => huin}/goupnp/ssdp/ssdp.go | 2 +- p2p/nat/natupnp.go | 6 +++--- 23 files changed, 32 insertions(+), 33 deletions(-) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/LICENSE (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/README.md (91%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/cmd/example_httpu_serving/example_httpu_serving.go (92%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/cmd/example_internetgateway1/example_internetgateway1.go (97%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/dcps/internetgateway1/internetgateway1.go (99%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/dcps/internetgateway2/internetgateway2.go (99%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/device.go (98%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/example/example.go (80%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/example/example_test.go (96%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/gotasks/specgen_task.go (98%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/goupnp.go (91%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/httpu/httpu.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/httpu/serve.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/scpd/scpd.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/service_client.go (97%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/soap/soap.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/soap/soap_test.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/soap/types.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/soap/types_test.go (100%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/ssdp/registry.go (99%) rename Godeps/_workspace/src/github.com/{fjl => huin}/goupnp/ssdp/ssdp.go (98%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d91269c1d..9b7306530 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -24,15 +24,15 @@ "ImportPath": "github.com/ethereum/serpent-go", "Rev": "5767a0dbd759d313df3f404dadb7f98d7ab51443" }, - { - "ImportPath": "github.com/fjl/goupnp", - "Rev": "fa95df6feb61e136b499d01711fcd410ccaf20c1" - }, { "ImportPath": "github.com/howeyc/fsnotify", "Comment": "v0.9.0-11-g6b1ef89", "Rev": "6b1ef893dc11e0447abda6da20a5203481878dda" }, + { + "ImportPath": "github.com/huin/goupnp", + "Rev": "4191d8a85005844ea202fde52799681971b12dfe" + }, { "ImportPath": "github.com/jackpal/go-nat-pmp", "Rev": "a45aa3d54aef73b504e15eb71bea0e5565b5e6e1" diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/LICENSE b/Godeps/_workspace/src/github.com/huin/goupnp/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/LICENSE rename to Godeps/_workspace/src/github.com/huin/goupnp/LICENSE diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/README.md b/Godeps/_workspace/src/github.com/huin/goupnp/README.md similarity index 91% rename from Godeps/_workspace/src/github.com/fjl/goupnp/README.md rename to Godeps/_workspace/src/github.com/huin/goupnp/README.md index d464c8288..ea2c155a1 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/README.md +++ b/Godeps/_workspace/src/github.com/huin/goupnp/README.md @@ -3,7 +3,7 @@ goupnp is a UPnP client library for Go Installation ------------ -Run `go get -u github.com/fjl/goupnp`. +Run `go get -u github.com/huin/goupnp`. Regenerating dcps generated source code: ---------------------------------------- diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_httpu_serving/example_httpu_serving.go b/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go similarity index 92% rename from Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_httpu_serving/example_httpu_serving.go rename to Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go index d56d39572..d9d9daa93 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_httpu_serving/example_httpu_serving.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_httpu_serving/example_httpu_serving.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/fjl/goupnp/httpu" + "github.com/huin/goupnp/httpu" ) func main() { diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_internetgateway1/example_internetgateway1.go b/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go similarity index 97% rename from Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_internetgateway1/example_internetgateway1.go rename to Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go index fda612500..29e8adc8b 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/cmd/example_internetgateway1/example_internetgateway1.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/cmd/example_internetgateway1/example_internetgateway1.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "github.com/fjl/goupnp/dcps/internetgateway1" + "github.com/huin/goupnp/dcps/internetgateway1" ) func main() { diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway1/internetgateway1.go b/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go similarity index 99% rename from Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway1/internetgateway1.go rename to Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go index 49659722c..be71855a9 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway1/internetgateway1.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go @@ -11,8 +11,8 @@ package internetgateway1 import ( "time" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/soap" + "github.com/huin/goupnp" + "github.com/huin/goupnp/soap" ) // Hack to avoid Go complaining if time isn't used. diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway2/internetgateway2.go b/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go similarity index 99% rename from Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway2/internetgateway2.go rename to Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go index cf34c61f0..a5892288e 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/dcps/internetgateway2/internetgateway2.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/dcps/internetgateway2/internetgateway2.go @@ -11,8 +11,8 @@ package internetgateway2 import ( "time" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/soap" + "github.com/huin/goupnp" + "github.com/huin/goupnp/soap" ) // Hack to avoid Go complaining if time isn't used. diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/device.go b/Godeps/_workspace/src/github.com/huin/goupnp/device.go similarity index 98% rename from Godeps/_workspace/src/github.com/fjl/goupnp/device.go rename to Godeps/_workspace/src/github.com/huin/goupnp/device.go index 2b8e9bb07..e5b658b21 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/device.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/device.go @@ -8,8 +8,8 @@ import ( "fmt" "net/url" - "github.com/fjl/goupnp/scpd" - "github.com/fjl/goupnp/soap" + "github.com/huin/goupnp/scpd" + "github.com/huin/goupnp/soap" ) const ( diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/example/example.go b/Godeps/_workspace/src/github.com/huin/goupnp/example/example.go similarity index 80% rename from Godeps/_workspace/src/github.com/fjl/goupnp/example/example.go rename to Godeps/_workspace/src/github.com/huin/goupnp/example/example.go index aae4c28f4..df7420226 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/example/example.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/example/example.go @@ -2,5 +2,5 @@ // // To run examples and see the output for your local network, run the following // command (specifically including the -v flag): -// go test -v github.com/fjl/goupnp/example +// go test -v github.com/huin/goupnp/example package example diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/example/example_test.go b/Godeps/_workspace/src/github.com/huin/goupnp/example/example_test.go similarity index 96% rename from Godeps/_workspace/src/github.com/fjl/goupnp/example/example_test.go rename to Godeps/_workspace/src/github.com/huin/goupnp/example/example_test.go index d926a06b0..1f3667df7 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/example/example_test.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/example/example_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/dcps/internetgateway1" + "github.com/huin/goupnp" + "github.com/huin/goupnp/dcps/internetgateway1" ) // Use discovered WANPPPConnection1 services to find external IP addresses. diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/gotasks/specgen_task.go b/Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go similarity index 98% rename from Godeps/_workspace/src/github.com/fjl/goupnp/gotasks/specgen_task.go rename to Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go index 006e8fef3..0ac1d4ff3 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/gotasks/specgen_task.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/gotasks/specgen_task.go @@ -17,8 +17,8 @@ import ( "strings" "text/template" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/scpd" + "github.com/huin/goupnp" + "github.com/huin/goupnp/scpd" "github.com/huin/goutil/codegen" "github.com/jingweno/gotask/tasking" ) @@ -38,7 +38,7 @@ var ( // -s, --spec_filename= // Path to the specification file, available from http://upnp.org/resources/upnpresources.zip // -o, --out_dir= -// Path to the output directory. This is is where the DCP source files will be placed. Should normally correspond to the directory for github.com/fjl/goupnp/dcps +// Path to the output directory. This is is where the DCP source files will be placed. Should normally correspond to the directory for github.com/huin/goupnp/dcps // --nogofmt // Disable passing the output through gofmt. Do this if debugging code output problems and needing to see the generated code prior to being passed through gofmt. func TaskSpecgen(t *tasking.T) { @@ -445,8 +445,8 @@ package {{$name}} import ( "time" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/soap" + "github.com/huin/goupnp" + "github.com/huin/goupnp/soap" ) // Hack to avoid Go complaining if time isn't used. diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/goupnp.go b/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go similarity index 91% rename from Godeps/_workspace/src/github.com/fjl/goupnp/goupnp.go rename to Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go index c962fbc57..120b92444 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/goupnp.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/goupnp.go @@ -1,11 +1,11 @@ // goupnp is an implementation of a client for various UPnP services. // // For most uses, it is recommended to use the code-generated packages under -// github.com/fjl/goupnp/dcps. Example use is shown at -// http://godoc.org/github.com/fjl/goupnp/example +// github.com/huin/goupnp/dcps. Example use is shown at +// http://godoc.org/github.com/huin/goupnp/example // // A commonly used client is internetgateway1.WANPPPConnection1: -// http://godoc.org/github.com/fjl/goupnp/dcps/internetgateway1#WANPPPConnection1 +// http://godoc.org/github.com/huin/goupnp/dcps/internetgateway1#WANPPPConnection1 // // Currently only a couple of schemas have code generated for them from the // UPnP example XML specifications. Not all methods will work on these clients, @@ -20,8 +20,8 @@ import ( "net/http" "net/url" - "github.com/fjl/goupnp/httpu" - "github.com/fjl/goupnp/ssdp" + "github.com/huin/goupnp/httpu" + "github.com/huin/goupnp/ssdp" ) // ContextError is an error that wraps an error with some context information. diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/httpu/httpu.go b/Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/httpu/httpu.go rename to Godeps/_workspace/src/github.com/huin/goupnp/httpu/httpu.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/httpu/serve.go b/Godeps/_workspace/src/github.com/huin/goupnp/httpu/serve.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/httpu/serve.go rename to Godeps/_workspace/src/github.com/huin/goupnp/httpu/serve.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/scpd/scpd.go b/Godeps/_workspace/src/github.com/huin/goupnp/scpd/scpd.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/scpd/scpd.go rename to Godeps/_workspace/src/github.com/huin/goupnp/scpd/scpd.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/service_client.go b/Godeps/_workspace/src/github.com/huin/goupnp/service_client.go similarity index 97% rename from Godeps/_workspace/src/github.com/fjl/goupnp/service_client.go rename to Godeps/_workspace/src/github.com/huin/goupnp/service_client.go index 258b7593b..c0d16ce2a 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/service_client.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/service_client.go @@ -2,8 +2,7 @@ package goupnp import ( "fmt" - - "github.com/fjl/goupnp/soap" + "github.com/huin/goupnp/soap" ) // ServiceClient is a SOAP client, root device and the service for the SOAP diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/soap/soap.go b/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/soap/soap.go rename to Godeps/_workspace/src/github.com/huin/goupnp/soap/soap.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/soap/soap_test.go b/Godeps/_workspace/src/github.com/huin/goupnp/soap/soap_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/soap/soap_test.go rename to Godeps/_workspace/src/github.com/huin/goupnp/soap/soap_test.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/soap/types.go b/Godeps/_workspace/src/github.com/huin/goupnp/soap/types.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/soap/types.go rename to Godeps/_workspace/src/github.com/huin/goupnp/soap/types.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/soap/types_test.go b/Godeps/_workspace/src/github.com/huin/goupnp/soap/types_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/fjl/goupnp/soap/types_test.go rename to Godeps/_workspace/src/github.com/huin/goupnp/soap/types_test.go diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/registry.go b/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go similarity index 99% rename from Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/registry.go rename to Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go index 9e2611b7f..38d10203f 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/registry.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/registry.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/fjl/goupnp/httpu" + "github.com/huin/goupnp/httpu" ) const ( diff --git a/Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/ssdp.go b/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go similarity index 98% rename from Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/ssdp.go rename to Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go index 6a186afa5..8178f5d94 100644 --- a/Godeps/_workspace/src/github.com/fjl/goupnp/ssdp/ssdp.go +++ b/Godeps/_workspace/src/github.com/huin/goupnp/ssdp/ssdp.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/fjl/goupnp/httpu" + "github.com/huin/goupnp/httpu" ) const ( diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go index 25cbc0d71..ef7765e8d 100644 --- a/p2p/nat/natupnp.go +++ b/p2p/nat/natupnp.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/fjl/goupnp" - "github.com/fjl/goupnp/dcps/internetgateway1" - "github.com/fjl/goupnp/dcps/internetgateway2" + "github.com/huin/goupnp" + "github.com/huin/goupnp/dcps/internetgateway1" + "github.com/huin/goupnp/dcps/internetgateway2" ) type upnp struct {