mirrors_public/schollz_croc
1
1
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

better error

Browse source
This commit is contained in:
Zack Scholl 2020-09-13 12:15:05 -07:00
parent 4fc40274db
commit 8a0800ca90
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/compress/compress.go
View file

@ -34,7 +34,7 @@ func Decompress(src []byte) []byte {
func compress(src []byte, dest io.Writer, level int) { func compress(src []byte, dest io.Writer, level int) {
compressor, _ := flate.NewWriter(dest, level) compressor, _ := flate.NewWriter(dest, level)
if _, err := compressor.Write(src); err != nil { if _, err := compressor.Write(src); err != nil {
log.Errorf("error writing data: %v", err) log.Debugf("error writing data: %v", err)
} }
compressor.Close() compressor.Close()
} }
@ -43,7 +43,7 @@ func compress(src []byte, dest io.Writer, level int) {
func decompress(src io.Reader, dest io.Writer) { func decompress(src io.Reader, dest io.Writer) {
decompressor := flate.NewReader(src) decompressor := flate.NewReader(src)
if _, err := io.Copy(dest, decompressor); err != nil { if _, err := io.Copy(dest, decompressor); err != nil {
log.Errorf("error copying data: %v", err) log.Debugf("error copying data: %v", err)
} }
decompressor.Close() decompressor.Close()
} }

8
src/croc/croc.go
View file

@ -579,7 +579,7 @@ func (c *Client) Receive() (err error) {
log.Debugf("ips data: %s", data) log.Debugf("ips data: %s", data)
var ips []string var ips []string
if err := json.Unmarshal(data, &ips); err != nil { if err := json.Unmarshal(data, &ips); err != nil {
log.Errorf("ips unmarshal error: %v", err) log.Debugf("ips unmarshal error: %v", err)
} }
if len(ips) > 1 { if len(ips) > 1 {
port := ips[0] port := ips[0]
@ -698,6 +698,10 @@ func (c *Client) transfer(options TransferOptions) (err error) {
log.Debugf("pake error: %s", err.Error()) log.Debugf("pake error: %s", err.Error())
err = fmt.Errorf("password mismatch") err = fmt.Errorf("password mismatch")
} }
if err != nil && strings.Contains(err.Error(), "unexpected end of JSON input") {
log.Debugf("error: %s", err.Error())
err = fmt.Errorf("room not ready")
}
return return
} }
@ -705,7 +709,7 @@ func (c *Client) processMessageFileInfo(m message.Message) (done bool, err error
var senderInfo SenderInfo var senderInfo SenderInfo
err = json.Unmarshal(m.Bytes, &senderInfo) err = json.Unmarshal(m.Bytes, &senderInfo)
if err != nil { if err != nil {
log.Error(err) log.Debug(err)
return return
} }
c.Options.SendingText = senderInfo.SendingText c.Options.SendingText = senderInfo.SendingText