fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-12 12:50:28 +08:00
Code Activity

add logs

Browse Source
This commit is contained in:
fumiama
2021-12-31 20:06:18 +08:00
parent 2761865178
commit f7cf029d00
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gold/link/link.go
View File

@@ -82,13 +82,15 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
} }
return l.write(p, uint32(len(p.Data)), 0, istransfer, false) return l.write(p, uint32(len(p.Data)), 0, istransfer, false)
} }
p.FillHash() if !istransfer {
p.Data = l.Encode(p.Data) p.FillHash()
p.Data = l.Encode(p.Data)
}
data := p.Data data := p.Data
totl := uint32(len(data)) totl := uint32(len(data))
i := 0 i := 0
for ; int(totl)-i > int(l.me.mtu); i += int(l.me.mtu) { for ; int(totl)-i > int(l.me.mtu); i += int(l.me.mtu) {
logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i) logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i-int(l.me.mtu))
packet := *p packet := *p
packet.Data = data[:int(l.me.mtu)] packet.Data = data[:int(l.me.mtu)]
cnt, err := l.write(&packet, totl, uint16(i), istransfer, true) cnt, err := l.write(&packet, totl, uint16(i), istransfer, true)
@@ -110,7 +112,7 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
func (l *Link) String() (n string) { func (l *Link) String() (n string) {
n = "default" n = "default"
if l.pubk != nil { if l.pubk != nil {
b, err := base14.UTF16be2utf8(base14.Encode(l.pubk[:10])) b, err := base14.UTF16be2utf8(base14.Encode(l.pubk[:7]))
if err == nil { if err == nil {
n = helper.BytesToString(b) n = helper.BytesToString(b)
} else { } else {

3
gold/link/recv.go
View File

@@ -2,6 +2,7 @@ package link
import ( import (
"encoding/binary" "encoding/binary"
"encoding/hex"
"time" "time"
"unsafe" "unsafe"
@@ -54,6 +55,7 @@ func (m *Me) wait(data []byte) *head.Packet {
hsh := *(*[32]byte)(*(*unsafe.Pointer)(unsafe.Pointer(&hashd))) hsh := *(*[32]byte)(*(*unsafe.Pointer)(unsafe.Pointer(&hashd)))
h, ok := m.recving[hsh] h, ok := m.recving[hsh]
if ok { if ok {
logrus.Infoln("[recv] get another frag part of", hex.EncodeToString(hashd))
ok, err := h.Unmarshal(data) ok, err := h.Unmarshal(data)
if err == nil { if err == nil {
if ok { if ok {
@@ -65,6 +67,7 @@ func (m *Me) wait(data []byte) *head.Packet {
} }
return nil return nil
} }
logrus.Infoln("[recv] get new frag part of", hex.EncodeToString(hashd))
h = &head.Packet{} h = &head.Packet{}
_, err := h.Unmarshal(data) _, err := h.Unmarshal(data)
if err != nil { if err != nil {