gofmt
This commit is contained in:
@ -83,12 +83,12 @@ I'm eventually going to make the manager implement net.Conn. This won't be
|
||||
exposed in the default application probably though, but rather as a library.
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwCQB4ACgkQ11wDs5te
|
||||
FOGS9wf+Nd+xcruNib+9rHhMWfuDFw4v10Bj4SAR+XucZLfbRwPXEO83jDuxp1vM
|
||||
aoWX0K3DNLN7zj1kV+mtLoliYgG4/8RdbBP08O9ErdLWgT3lh5sUpD5i0JBaGo4U
|
||||
F1e5DAABsm4/uAPVGkq4vVm5goA55g3Izy20qApvrApaKhDVRy1WI21eeOX0qc0k
|
||||
xDc2eeMuqc/183kmQW2H6IbsEx4MQJ7kNTSLl5Mtv6Frg//1NxLGBhAdjjpt47dS
|
||||
WZnidyOJdV1yP57N+MaevrLLKGZXH9gzbZmkgpd4PH3OLt3r418dno7IMR8Z7wwN
|
||||
5X5e8pjPsEMWHbjxZJ6Vb57vEL0Chw==
|
||||
=zRKa
|
||||
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlwCQZ8ACgkQ11wDs5te
|
||||
FOFrJAgAoq89/ZeWC99785pbfnV2cqZ6YEB5d6y5CYVE//nZgIec7XV18ABkFdiJ
|
||||
MlTxHEny1+Lq+f8AQh9h9UqqD2DHRPdf3JymfpDPVbV9eH+8tPReT0eAfdU/IZSr
|
||||
q0O9DviIqRYZ7dpXkz0On94tpDpaf5u+5bxzkEyJy9b8jqGuMvUKAGLMRL+IPMGx
|
||||
d+YZxK5s3bEwIbIoFMX/FNmTyXqRIauUfSg7TmZ+Hf4fcfwxG/73kq3EHAqzywn1
|
||||
lRZOjSJXNIn9+HnkFRvVrTQNlFmaoHnBBN33ZZjbZRC2wZTjHO9Ahc01JoZ3O8zT
|
||||
CrdzTJPtd3+B9lC9TmyBXxdHh4Zekg==
|
||||
=eUmm
|
||||
-----END PGP SIGNATURE-----
|
||||
|
@ -231,11 +231,11 @@ func (f *SAMClientForwarder) Serve() error {
|
||||
|
||||
//Close shuts the whole thing down.
|
||||
func (f *SAMClientForwarder) Close() error {
|
||||
var err error
|
||||
err = f.samConn.Close()
|
||||
var err error
|
||||
err = f.samConn.Close()
|
||||
err = f.connectStream.Close()
|
||||
err = f.publishConnection.Close()
|
||||
return err
|
||||
return err
|
||||
}
|
||||
|
||||
//NewSAMClientForwarder makes a new SAM forwarder with default options, accepts host:port arguments
|
||||
|
@ -342,12 +342,12 @@ func (f *SAMForwarder) Serve() error {
|
||||
|
||||
//Close shuts the whole thing down.
|
||||
func (f *SAMForwarder) Close() error {
|
||||
var err error
|
||||
err = f.samConn.Close()
|
||||
var err error
|
||||
err = f.samConn.Close()
|
||||
err = f.publishStream.Close()
|
||||
err = f.publishListen.Close()
|
||||
err = f.publishConnection.Close()
|
||||
return err
|
||||
return err
|
||||
}
|
||||
|
||||
//NewSAMForwarder makes a new SAM forwarder with default options, accepts host:port arguments
|
||||
|
@ -103,4 +103,3 @@ func TestOption5(t *testing.T) {
|
||||
}
|
||||
log.Println(client.List(""))
|
||||
}
|
||||
|
||||
|
@ -10,14 +10,14 @@ import "github.com/eyedeekay/sam-forwarder"
|
||||
import "github.com/eyedeekay/sam-forwarder/udp"
|
||||
|
||||
var (
|
||||
port = "8100"
|
||||
cport = "8101"
|
||||
directory = "./www"
|
||||
err error
|
||||
forwarder *samforwarder.SAMForwarder
|
||||
forwarderclient *samforwarder.SAMClientForwarder
|
||||
ssuforwarder *samforwarderudp.SAMSSUForwarder
|
||||
ssuforwarderclient *samforwarderudp.SAMSSUClientForwarder
|
||||
port = "8100"
|
||||
cport = "8101"
|
||||
directory = "./www"
|
||||
err error
|
||||
forwarder *samforwarder.SAMForwarder
|
||||
forwarderclient *samforwarder.SAMClientForwarder
|
||||
ssuforwarder *samforwarderudp.SAMSSUForwarder
|
||||
ssuforwarderclient *samforwarderudp.SAMSSUClientForwarder
|
||||
)
|
||||
|
||||
func serve() {
|
||||
@ -51,16 +51,14 @@ func client() {
|
||||
samforwarder.SetClientSAMHost("127.0.0.1"),
|
||||
samforwarder.SetClientSAMPort("7656"),
|
||||
samforwarder.SetClientName("testclient"),
|
||||
samforwarder.SetClientDestination(forwarder.Base32()),
|
||||
samforwarder.SetClientDestination(forwarder.Base32()),
|
||||
)
|
||||
if err != nil {
|
||||
if err != nil {
|
||||
log.Fatal(err.Error())
|
||||
}
|
||||
go forwarderclient.Serve()
|
||||
go forwarderclient.Serve()
|
||||
}
|
||||
|
||||
|
||||
|
||||
func serveudp() {
|
||||
flag.Parse()
|
||||
|
||||
@ -92,12 +90,10 @@ func clientudp() {
|
||||
samforwarderudp.SetClientSAMHost("127.0.0.1"),
|
||||
samforwarderudp.SetClientSAMPort("7656"),
|
||||
samforwarderudp.SetClientName("testclient"),
|
||||
samforwarderudp.SetClientDestination(forwarder.Base32()),
|
||||
samforwarderudp.SetClientDestination(forwarder.Base32()),
|
||||
)
|
||||
if err != nil {
|
||||
if err != nil {
|
||||
log.Fatal(err.Error())
|
||||
}
|
||||
go forwarderclient.Serve()
|
||||
go forwarderclient.Serve()
|
||||
}
|
||||
|
||||
|
||||
|
@ -1,26 +1,26 @@
|
||||
package samforwardertest
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
"net/http"
|
||||
"log"
|
||||
"log"
|
||||
"net/http"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestTCP(t *testing.T) {
|
||||
go serve()
|
||||
time.Sleep(time.Duration(60 * time.Second))
|
||||
go client()
|
||||
time.Sleep(time.Duration(60 * time.Second))
|
||||
resp, err := http.Get("http://127.0.0.1:"+cport+"/test.html")
|
||||
//defer forwarder.Close()
|
||||
//defer forwarderclient.Close()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
log.Println(resp)
|
||||
go serve()
|
||||
time.Sleep(time.Duration(60 * time.Second))
|
||||
go client()
|
||||
time.Sleep(time.Duration(60 * time.Second))
|
||||
resp, err := http.Get("http://127.0.0.1:" + cport + "/test.html")
|
||||
//defer forwarder.Close()
|
||||
//defer forwarderclient.Close()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
log.Println(resp)
|
||||
}
|
||||
|
||||
func TestUDP(t *testing.T){
|
||||
func TestUDP(t *testing.T) {
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user