Debug ping

This commit is contained in:
9seconds
2018-07-08 18:11:23 +03:00
parent a99c5b2442
commit 35b38fe55c
3 changed files with 8 additions and 5 deletions
+6 -2
View File
@@ -112,22 +112,26 @@ func (p *Proxy) middlePipe(src wrappers.PacketReadCloser, dst wrappers.PacketWri
packet, err := src.Read() packet, err := src.Read()
if err != nil { if err != nil {
src.Logger().Warnw("Cannot read packet", "error", err)
return return
} }
if _, err = dst.Write(packet); err != nil { if _, err = dst.Write(packet); err != nil {
src.Logger().Warnw("Cannot write packet", "error", err)
return return
} }
} }
} }
func (p *Proxy) directPipe(src io.ReadCloser, dst io.WriteCloser, wait *sync.WaitGroup) { func (p *Proxy) directPipe(src wrappers.StreamReadCloser, dst wrappers.StreamWriteCloser, wait *sync.WaitGroup) {
defer func() { defer func() {
src.Close() src.Close()
dst.Close() dst.Close()
wait.Done() wait.Done()
}() }()
io.Copy(dst, src) if _, err := io.Copy(dst, src); err != nil {
src.Logger().Warnw("Cannot pump sockets", "error", err)
}
} }
func NewProxy(conf *config.Config) *Proxy { func NewProxy(conf *config.Config) *Proxy {
+1 -1
View File
@@ -98,7 +98,7 @@ func (m *MTProtoAbridged) Write(p []byte) (int, error) {
"counter", m.writeCounter, "counter", m.writeCounter,
) )
if len(p)%4 == 0 { if len(p)%4 != 0 {
return 0, errors.Errorf("Incorrect packet length %d", len(p)) return 0, errors.Errorf("Incorrect packet length %d", len(p))
} }
+1 -2
View File
@@ -44,8 +44,7 @@ type StreamReadWriter interface {
} }
type StreamWriteCloser interface { type StreamWriteCloser interface {
io.Closer io.WriteCloser
io.Writer
Wrap Wrap
} }