p2p/nat: switch to github.com/huin/goupnp

My temporary fix was merged upstream.
This commit is contained in:
Felix Lange 2015-02-17 13:10:11 +01:00
parent 119bea22aa
commit f965f41b6e
23 changed files with 32 additions and 33 deletions

8
Godeps/Godeps.json generated
View File

@ -24,15 +24,15 @@
"ImportPath": "github.com/ethereum/serpent-go", "ImportPath": "github.com/ethereum/serpent-go",
"Rev": "5767a0dbd759d313df3f404dadb7f98d7ab51443" "Rev": "5767a0dbd759d313df3f404dadb7f98d7ab51443"
}, },
{
"ImportPath": "github.com/fjl/goupnp",
"Rev": "fa95df6feb61e136b499d01711fcd410ccaf20c1"
},
{ {
"ImportPath": "github.com/howeyc/fsnotify", "ImportPath": "github.com/howeyc/fsnotify",
"Comment": "v0.9.0-11-g6b1ef89", "Comment": "v0.9.0-11-g6b1ef89",
"Rev": "6b1ef893dc11e0447abda6da20a5203481878dda" "Rev": "6b1ef893dc11e0447abda6da20a5203481878dda"
}, },
{
"ImportPath": "github.com/huin/goupnp",
"Rev": "4191d8a85005844ea202fde52799681971b12dfe"
},
{ {
"ImportPath": "github.com/jackpal/go-nat-pmp", "ImportPath": "github.com/jackpal/go-nat-pmp",
"Rev": "a45aa3d54aef73b504e15eb71bea0e5565b5e6e1" "Rev": "a45aa3d54aef73b504e15eb71bea0e5565b5e6e1"

View File

@ -3,7 +3,7 @@ goupnp is a UPnP client library for Go
Installation Installation
------------ ------------
Run `go get -u github.com/fjl/goupnp`. Run `go get -u github.com/huin/goupnp`.
Regenerating dcps generated source code: Regenerating dcps generated source code:
---------------------------------------- ----------------------------------------

View File

@ -4,7 +4,7 @@ import (
"log" "log"
"net/http" "net/http"
"github.com/fjl/goupnp/httpu" "github.com/huin/goupnp/httpu"
) )
func main() { func main() {

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"log" "log"
"github.com/fjl/goupnp/dcps/internetgateway1" "github.com/huin/goupnp/dcps/internetgateway1"
) )
func main() { func main() {

View File

@ -11,8 +11,8 @@ package internetgateway1
import ( import (
"time" "time"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/soap" "github.com/huin/goupnp/soap"
) )
// Hack to avoid Go complaining if time isn't used. // Hack to avoid Go complaining if time isn't used.

View File

@ -11,8 +11,8 @@ package internetgateway2
import ( import (
"time" "time"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/soap" "github.com/huin/goupnp/soap"
) )
// Hack to avoid Go complaining if time isn't used. // Hack to avoid Go complaining if time isn't used.

View File

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"github.com/fjl/goupnp/scpd" "github.com/huin/goupnp/scpd"
"github.com/fjl/goupnp/soap" "github.com/huin/goupnp/soap"
) )
const ( const (

View File

@ -2,5 +2,5 @@
// //
// To run examples and see the output for your local network, run the following // To run examples and see the output for your local network, run the following
// command (specifically including the -v flag): // command (specifically including the -v flag):
// go test -v github.com/fjl/goupnp/example // go test -v github.com/huin/goupnp/example
package example package example

View File

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/dcps/internetgateway1" "github.com/huin/goupnp/dcps/internetgateway1"
) )
// Use discovered WANPPPConnection1 services to find external IP addresses. // Use discovered WANPPPConnection1 services to find external IP addresses.

View File

@ -17,8 +17,8 @@ import (
"strings" "strings"
"text/template" "text/template"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/scpd" "github.com/huin/goupnp/scpd"
"github.com/huin/goutil/codegen" "github.com/huin/goutil/codegen"
"github.com/jingweno/gotask/tasking" "github.com/jingweno/gotask/tasking"
) )
@ -38,7 +38,7 @@ var (
// -s, --spec_filename=<upnpresources.zip> // -s, --spec_filename=<upnpresources.zip>
// Path to the specification file, available from http://upnp.org/resources/upnpresources.zip // Path to the specification file, available from http://upnp.org/resources/upnpresources.zip
// -o, --out_dir=<output directory> // -o, --out_dir=<output directory>
// 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 // --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. // 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) { func TaskSpecgen(t *tasking.T) {
@ -445,8 +445,8 @@ package {{$name}}
import ( import (
"time" "time"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/soap" "github.com/huin/goupnp/soap"
) )
// Hack to avoid Go complaining if time isn't used. // Hack to avoid Go complaining if time isn't used.

View File

@ -1,11 +1,11 @@
// goupnp is an implementation of a client for various UPnP services. // goupnp is an implementation of a client for various UPnP services.
// //
// For most uses, it is recommended to use the code-generated packages under // For most uses, it is recommended to use the code-generated packages under
// github.com/fjl/goupnp/dcps. Example use is shown at // github.com/huin/goupnp/dcps. Example use is shown at
// http://godoc.org/github.com/fjl/goupnp/example // http://godoc.org/github.com/huin/goupnp/example
// //
// A commonly used client is internetgateway1.WANPPPConnection1: // 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 // 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, // UPnP example XML specifications. Not all methods will work on these clients,
@ -20,8 +20,8 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"github.com/fjl/goupnp/httpu" "github.com/huin/goupnp/httpu"
"github.com/fjl/goupnp/ssdp" "github.com/huin/goupnp/ssdp"
) )
// ContextError is an error that wraps an error with some context information. // ContextError is an error that wraps an error with some context information.

View File

@ -2,8 +2,7 @@ package goupnp
import ( import (
"fmt" "fmt"
"github.com/huin/goupnp/soap"
"github.com/fjl/goupnp/soap"
) )
// ServiceClient is a SOAP client, root device and the service for the SOAP // ServiceClient is a SOAP client, root device and the service for the SOAP

View File

@ -10,7 +10,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/fjl/goupnp/httpu" "github.com/huin/goupnp/httpu"
) )
const ( const (

View File

@ -8,7 +8,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/fjl/goupnp/httpu" "github.com/huin/goupnp/httpu"
) )
const ( const (

View File

@ -7,9 +7,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/fjl/goupnp" "github.com/huin/goupnp"
"github.com/fjl/goupnp/dcps/internetgateway1" "github.com/huin/goupnp/dcps/internetgateway1"
"github.com/fjl/goupnp/dcps/internetgateway2" "github.com/huin/goupnp/dcps/internetgateway2"
) )
type upnp struct { type upnp struct {