Figure out where I need to defer those closes.

This commit is contained in:
idk
2018-09-10 20:06:09 -04:00
parent a874659167
commit b53e0dee95
2 changed files with 12 additions and 11 deletions

View File

@ -179,12 +179,12 @@ TLS configuration is experimental. It might not be possible(To multiplex http
and https on the same SAM tunnel). and https on the same SAM tunnel).
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAluXBeMACgkQ11wDs5te iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAluXBu4ACgkQ11wDs5te
FOHllQgAsvWL/pwS9WDFI8gt/kOhdh15ACFmR7oAA/y81G56S1J0kLGvjV38OUwf FOFziQf/Z+/x4fw0UcgCx7DZnXyBrAjjdq5wp51ggawJeSN22qWVDErD6SI8cBnx
CTM88oQOOeYNO9OcyKtxSkPrXd/wlGaa56AA9o2ZE5SafcQTqQelHyPtIH4pCJj/ 0ElA4rcaOhczx2s+5EFlmFvGjHHcZWi9M0cN9iirYy3Dpxqp5N5akRyOVuxX8bfa
7M6iYbwI6gufsRGlNxgRMp3VMQjMzHxsUOnsc2OioEn0TtHf0eIpE3wx0mLvhZsu JxLPaO93dkV2Ign4yRVlF4DkbIWH+pyFy9aIa0RqT3qgOgvaCfuRQhvkDBgG+iT8
TScrNfcKvaFwti017pELks34VbYquyOP7jHSDIfmSfZj/LWsYtQHLNzcpW21BbUE BDdm3XU6xDJTfbDdQqJ/NTPWXQwiWl4vQrlk/KSjAHSIOpNw15E5tPNACG4qQaQH
lc+J2BdU/p9L6D6bpZMT/iwC/EcYjwGP0My/SRtd7fFeLsoONGXgUm8eSIg3ndSz U4TSqLd7aW2+/+9d4ns/1cJ/tGm9dopEyN2vb9zSM41OXsNSvgkmv+l+J1hVLu2S
stL1pgPBvw7QMJbcwGTGNKgyuxy0/Q== Zj1qrnn4TbhShkbOIyUSbFL2+pVPFg==
=QbVl =BX0F
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

View File

@ -144,11 +144,10 @@ func (f *SAMForwarder) forward(conn *sam3.SAMConn) { //(conn net.Conn) {
var client net.Conn var client net.Conn
if client, err = net.Dial("tcp", f.Target()); err != nil { if client, err = net.Dial("tcp", f.Target()); err != nil {
log.Fatalf("Dial failed: %v", err) log.Fatalf("Dial failed: %v", err)
} else {
defer client.Close()
defer conn.Close()
} }
go func() { go func() {
defer client.Close()
defer conn.Close()
if f.Type == "http" { if f.Type == "http" {
if requestbytes, request, err = f.HTTPRequestBytes(conn); err == nil { if requestbytes, request, err = f.HTTPRequestBytes(conn); err == nil {
log.Printf("Forwarding modified request: \n\t %s", string(requestbytes)) log.Printf("Forwarding modified request: \n\t %s", string(requestbytes))
@ -161,6 +160,8 @@ func (f *SAMForwarder) forward(conn *sam3.SAMConn) { //(conn net.Conn) {
} }
}() }()
go func() { go func() {
defer client.Close()
defer conn.Close()
if f.Type == "http" { if f.Type == "http" {
if responsebytes, err = f.HTTPResponseBytes(client, request); err == nil { if responsebytes, err = f.HTTPResponseBytes(client, request); err == nil {
log.Printf("Forwarding modified response: \n\t%s", string(requestbytes)) log.Printf("Forwarding modified response: \n\t%s", string(requestbytes))