Commit 6d0efaeb authored by rui.zheng's avatar rui.zheng

add print

parent c09984ad
...@@ -233,7 +233,9 @@ func (g *Gost) srv(conn net.Conn) { ...@@ -233,7 +233,9 @@ func (g *Gost) srv(conn net.Conn) {
} }
lg.Logln("|<<<", cmd) lg.Logln("|<<<", cmd)
tunnelUdp(conn, uconn, true) if err := tunnelUdp(conn, uconn, true); err != nil {
lg.Logln(err)
}
/* /*
up, err := ReadUdpPayload(uconn) up, err := ReadUdpPayload(uconn)
if err != nil { if err != nil {
...@@ -348,7 +350,6 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) { ...@@ -348,7 +350,6 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) {
rChan <- err rChan <- err
return return
} }
log.Println("r", up)
addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(up.Addr, strconv.Itoa(int(up.Port)))) addr, err := net.ResolveUDPAddr("udp", net.JoinHostPort(up.Addr, strconv.Itoa(int(up.Port))))
if err != nil { if err != nil {
...@@ -360,6 +361,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) { ...@@ -360,6 +361,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) {
rChan <- err rChan <- err
return return
} }
log.Println("r", up)
} else { } else {
up.Rsv = 0 up.Rsv = 0
buf := &bytes.Buffer{} buf := &bytes.Buffer{}
...@@ -368,6 +370,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) { ...@@ -368,6 +370,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) {
rChan <- err rChan <- err
return return
} }
log.Println("r", up)
} }
} }
}() }()
...@@ -394,7 +397,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) { ...@@ -394,7 +397,7 @@ func tunnelUdp(conn net.Conn, uconn *net.UDPConn, rawUdp bool) (err error) {
continue continue
} }
rbuf := bytes.NewReader(b) rbuf := bytes.NewReader(b[:n])
up, err := ReadUdpPayload(rbuf) up, err := ReadUdpPayload(rbuf)
if err != nil { if err != nil {
wChan <- err wChan <- err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment