Peernet-Archive/core
1
0
Fork 0
mirror of https://github.com/PeernetOfficial/core.git synced 2026-07-20 20:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Protocol: Fixes in Transfer code. Add IsLast convenience functions.

Browse Source
This commit is contained in:
Kleissner
2021-10-22 06:23:56 +02:00
parent 89f9e3a563
commit 0c4562e1d3
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
protocol/Message Encoding Response.go
View File

@@ -435,3 +435,8 @@ func encodePeerRecord(raw []byte, peer *PeerRecord, reason uint8) {
binary.LittleEndian.PutUint16(raw[61:61+2], peer.IPv6PortReportedInternal) binary.LittleEndian.PutUint16(raw[61:61+2], peer.IPv6PortReportedInternal)
binary.LittleEndian.PutUint16(raw[63:63+2], peer.IPv6PortReportedExternal) binary.LittleEndian.PutUint16(raw[63:63+2], peer.IPv6PortReportedExternal)
} }
// IsLast checks if the incoming message is the last expected response in this sequence.
func (msg *MessageResponse) IsLast() bool {
return msg.Actions&(1<<ActionSequenceLast) > 0
}

33
protocol/Message Encoding Transfer.go
View File

@@ -24,13 +24,13 @@ import (
// MessageTransfer is the decoded transfer message. // MessageTransfer is the decoded transfer message.
// It is sent to initiate a file transfer, and to send data as part of a file transfer. The actual file data is encapsulated via UDT. // It is sent to initiate a file transfer, and to send data as part of a file transfer. The actual file data is encapsulated via UDT.
type MessageTransfer struct { type MessageTransfer struct {
*MessageRaw // Underlying raw message. *MessageRaw // Underlying raw message.
Control uint8 // Control. See TransferControlX. Control uint8 // Control. See TransferControlX.
TransferProtocol uint8 // Embedded transfer protocol: 0 = UDT TransferProtocol uint8 // Embedded transfer protocol: 0 = UDT
Hash []byte // Hash of the file to transfer. Hash []byte // Hash of the file to transfer.
Offset uint64 // Offset to start reading at. Only TransferControlRequestStart. Offset uint64 // Offset to start reading at. Only TransferControlRequestStart.
Limit uint64 // Limit (count of bytes) to read starting at the offset. Only TransferControlRequestStart. Limit uint64 // Limit (count of bytes) to read starting at the offset. Only TransferControlRequestStart.
EmbeddedPacketRaw []byte // Embedded packet. Only TransferControlActive. Data []byte // Embedded protocol data. Only TransferControlActive.
} }
const ( const (
@@ -68,21 +68,21 @@ func DecodeTransfer(msg *MessageRaw) (result *MessageTransfer, err error) {
result.Limit = binary.LittleEndian.Uint64(msg.Payload[42 : 42+8]) result.Limit = binary.LittleEndian.Uint64(msg.Payload[42 : 42+8])
case TransferControlActive: case TransferControlActive:
result.EmbeddedPacketRaw = msg.Payload[34:] result.Data = msg.Payload[34:]
} }
return nil, nil return result, nil
} }
// TransferMaxEmbedSize is the maximum size of embedded data inside the Transfer message. // TransferMaxEmbedSize is the maximum size of embedded data inside the Transfer message.
const TransferMaxEmbedSize = udpMaxPacketSize - PacketLengthMin - transferPayloadHeaderSize const TransferMaxEmbedSize = udpMaxPacketSize - PacketLengthMin - transferPayloadHeaderSize
// EncodeTransfer encodes a transfer message. The embedded packet size must be smaller than TransferMaxEmbedSize. // EncodeTransfer encodes a transfer message. The embedded packet size must be smaller than TransferMaxEmbedSize.
func EncodeTransfer(senderPrivateKey *btcec.PrivateKey, embeddedPacketRaw []byte, control, transferProtocol uint8, hash []byte, offset, limit uint64) (packetRaw []byte, err error) { func EncodeTransfer(senderPrivateKey *btcec.PrivateKey, data []byte, control, transferProtocol uint8, hash []byte, offset, limit uint64) (packetRaw []byte, err error) {
if control == TransferControlRequestStart && len(embeddedPacketRaw) != 0 { if control == TransferControlRequestStart && len(data) != 0 {
return nil, errors.New("transfer encode: payload not allowed in start") return nil, errors.New("transfer encode: payload not allowed in start")
} else if isPacketSizeExceed(TransferMaxEmbedSize, len(embeddedPacketRaw)) { } else if isPacketSizeExceed(transferPayloadHeaderSize, len(data)) {
return nil, errors.New("transfer encode: embedded packet too big") return nil, errors.New("transfer encode: embedded packet too big")
} }
@@ -90,7 +90,7 @@ func EncodeTransfer(senderPrivateKey *btcec.PrivateKey, embeddedPacketRaw []byte
if control == TransferControlRequestStart { if control == TransferControlRequestStart {
packetSize += 16 packetSize += 16
} else if control == TransferControlActive { } else if control == TransferControlActive {
packetSize += len(embeddedPacketRaw) packetSize += len(data)
} }
raw := make([]byte, packetSize) raw := make([]byte, packetSize)
@@ -103,8 +103,13 @@ func EncodeTransfer(senderPrivateKey *btcec.PrivateKey, embeddedPacketRaw []byte
binary.LittleEndian.PutUint64(raw[34:34+8], offset) binary.LittleEndian.PutUint64(raw[34:34+8], offset)
binary.LittleEndian.PutUint64(raw[42:42+8], limit) binary.LittleEndian.PutUint64(raw[42:42+8], limit)
} else if control == TransferControlActive { } else if control == TransferControlActive {
copy(raw[34:34+len(embeddedPacketRaw)], embeddedPacketRaw) copy(raw[34:34+len(data)], data)
} }
return raw, nil return raw, nil
} }
// IsLast checks if the incoming message is the last one in this transfer.
func (msg *MessageTransfer) IsLast() bool {
return msg.Control == TransferControlTerminate || msg.Control == TransferControlNotAvailable
}