octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-10 18:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blockmap hash size

Browse Source
This commit is contained in:
Audrius Butkevicius 2014-10-18 00:39:36 +01:00
parent aa168ec2d6
commit c4d15b3b95
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/files/blockmap.go
View File

@ -171,26 +171,26 @@ func (f *BlockFinder) Iterate(hash []byte, iterFn func(string, string, uint32) b
// m.blockKey returns a byte slice encoding the following information: // m.blockKey returns a byte slice encoding the following information:
// keyTypeBlock (1 byte) // keyTypeBlock (1 byte)
// folder (64 bytes) // folder (64 bytes)
// block hash (64 bytes) // block hash (32 bytes)
// file name (variable size) // file name (variable size)
func toBlockKey(hash []byte, folder, file string) []byte { func toBlockKey(hash []byte, folder, file string) []byte {
o := make([]byte, 1+64+64+len(file)) o := make([]byte, 1+64+32+len(file))
o[0] = keyTypeBlock o[0] = keyTypeBlock
copy(o[1:], []byte(folder)) copy(o[1:], []byte(folder))
copy(o[1+64:], []byte(hash)) copy(o[1+64:], []byte(hash))
copy(o[1+64+64:], []byte(file)) copy(o[1+64+32:], []byte(file))
return o return o
} }
func fromBlockKey(data []byte) (string, string) { func fromBlockKey(data []byte) (string, string) {
if len(data) < 1+64+64+1 { if len(data) < 1+64+32+1 {
panic("Incorrect key length") panic("Incorrect key length")
} }
if data[0] != keyTypeBlock { if data[0] != keyTypeBlock {
panic("Incorrect key type") panic("Incorrect key type")
} }
file := string(data[1+64+64:]) file := string(data[1+64+32:])
slice := data[1 : 1+64] slice := data[1 : 1+64]
izero := bytes.IndexByte(slice, 0) izero := bytes.IndexByte(slice, 0)