sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-30 22:08:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

[peerdist] Include trimmed range within content information block

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2015-07-20 18:17:53 +01:00
parent b20d4a1522
commit f0d594557c
3 changed files with 76 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/pccrc.c
View File

@@ -747,7 +747,7 @@ int peerdist_info_segment ( const struct peerdist_info *info,
if ( ( rc = info->op->segment ( segment ) ) != 0 )
return rc;
DBGC2 ( info, "PCCRC %p segment %d covers [%08zx,%08zx) with %d "
DBGC2 ( info, "PCCRC %p segment %d range [%08zx,%08zx) with %d "
"blocks\n", info, segment->index, segment->range.start,
segment->range.end, segment->blocks );
DBGC2 ( info, "PCCRC %p segment %d digest %s\n", info, segment->index,
@@ -771,6 +771,8 @@ int peerdist_info_block ( const struct peerdist_info_segment *segment,
struct peerdist_info_block *block,
unsigned int index ) {
const struct peerdist_info *info = segment->info;
size_t start;
size_t end;
int rc;
/* Sanity checks */
@@ -793,11 +795,24 @@ int peerdist_info_block ( const struct peerdist_info_segment *segment,
if ( ( rc = info->op->block ( block ) ) != 0 )
return rc;
/* Calculate trimmed range */
start = block->range.start;
if ( start < info->trim.start )
start = info->trim.start;
end = block->range.end;
if ( end > info->trim.end )
end = info->trim.end;
if ( end < start )
end = start;
block->trim.start = start;
block->trim.end = end;
DBGC2 ( info, "PCCRC %p segment %d block %d hash %s\n",
info, segment->index, block->index,
peerdist_info_hash_ntoa ( info, block->hash ) );
DBGC2 ( info, "PCCRC %p segment %d block %d covers [%08zx,%08zx)\n",
info, segment->index, block->index, block->range.start,
block->range.end );
DBGC2 ( info, "PCCRC %p segment %d block %d range [%08zx,%08zx) covers "
"[%08zx,%08zx)\n", info, segment->index, block->index,
block->range.start, block->range.end, block->trim.start,
block->trim.end );
return 0;
}