i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* After my recent change, append_size() did not work correctly anymore, if

Browse Source 
the initial buffer wasn't empty.
* Enlarged the minimum header size a bit (one more data_node).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19406 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-12-01 09:45:23 +00:00
parent b9a724e79f
commit 8ad667cb0b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/stack/net_buffer.cpp
+4 -2
View File
@@ -682,12 +682,13 @@ append_size(net_buffer *_buffer, size_t size, void **_contiguousBuffer)
// compute how many buffers we're going to need // compute how many buffers we're going to need
// TODO: this doesn't leave any tail space, if that should be desired... // TODO: this doesn't leave any tail space, if that should be desired...
uint32 tailSpace = node->tail_space; uint32 tailSpace = node->tail_space;
uint32 minimalHeaderSpace = sizeof(data_header) + 2 * sizeof(data_node); uint32 minimalHeaderSpace = sizeof(data_header) + 3 * sizeof(data_node);
uint32 sizeNeeded = size - tailSpace; uint32 sizeNeeded = size - tailSpace;
uint32 count = (sizeNeeded + BUFFER_SIZE - minimalHeaderSpace - 1) uint32 count = (sizeNeeded + BUFFER_SIZE - minimalHeaderSpace - 1)
/ (BUFFER_SIZE - minimalHeaderSpace); / (BUFFER_SIZE - minimalHeaderSpace);
uint32 headerSpace = BUFFER_SIZE - sizeNeeded / count - sizeof(data_header); uint32 headerSpace = BUFFER_SIZE - sizeNeeded / count - sizeof(data_header);
uint32 sizeUsed = BUFFER_SIZE - sizeof(data_header) - headerSpace; uint32 sizeUsed = BUFFER_SIZE - sizeof(data_header) - headerSpace;
uint32 sizeAdded = tailSpace;
// allocate space left in the node // allocate space left in the node
node->tail_space -= tailSpace; node->tail_space -= tailSpace;
@@ -699,7 +700,7 @@ append_size(net_buffer *_buffer, size_t size, void **_contiguousBuffer)
for (uint32 i = 0; i < count; i++) { for (uint32 i = 0; i < count; i++) {
if (i == count - 1) { if (i == count - 1) {
// last data_header - compensate rounding errors // last data_header - compensate rounding errors
sizeUsed = size - buffer->size; sizeUsed = size - sizeAdded;
headerSpace = BUFFER_SIZE - sizeof(data_header) - sizeUsed; headerSpace = BUFFER_SIZE - sizeof(data_header) - sizeUsed;
} }
@@ -720,6 +721,7 @@ append_size(net_buffer *_buffer, size_t size, void **_contiguousBuffer)
header->first_node = node; header->first_node = node;
buffer->size += sizeUsed; buffer->size += sizeUsed;
sizeAdded += sizeUsed;
list_add_item(&buffer->buffers, node); list_add_item(&buffer->buffers, node);
} }