diff options
author | sr | 2012-08-24 20:54:29 +0200 |
---|---|---|
committer | sr | 2012-08-24 20:54:29 +0200 |
commit | 6d659475c248f5030c44acb0096771fcd09a7dee (patch) | |
tree | 2ca98bd13a775848974cf59ca2781941f7e91c1c /src/serialize.c | |
parent | [SERVER] IPC, delete image (diff) | |
download | dnbd3-6d659475c248f5030c44acb0096771fcd09a7dee.tar.gz dnbd3-6d659475c248f5030c44acb0096771fcd09a7dee.tar.xz dnbd3-6d659475c248f5030c44acb0096771fcd09a7dee.zip |
[*] Cleanup, comments, more error checks
[SERVER] Fix a few off-by-one bugs
[SERVER] Make log available through IPC
[KERNEL] Hot-Swap to faster connection on load-balance
[KERNEL] Report I/O error to block layer if no server replies within a given time frame
[*] Modified network protocol to handle volume names instead of ids
Diffstat (limited to 'src/serialize.c')
-rw-r--r-- | src/serialize.c | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/src/serialize.c b/src/serialize.c new file mode 100644 index 0000000..7961cfe --- /dev/null +++ b/src/serialize.c @@ -0,0 +1,74 @@ +#include "serialize.h" +#include "types.h" + +#ifndef MIN +#define MIN(a,b) (a < b ? a : b) +#endif + +void serializer_reset_read(serialized_buffer_t *buffer, size_t data_len) +{ + buffer->buffer_end = buffer->buffer + MIN(MAX_PAYLOAD, data_len); + buffer->buffer_pointer = buffer->buffer; +} + +void serializer_reset_write(serialized_buffer_t *buffer) +{ + buffer->buffer_end = buffer->buffer + MAX_PAYLOAD; + buffer->buffer_pointer = buffer->buffer; +} + +uint16_t serializer_get_uint16(serialized_buffer_t *buffer) +{ + uint16_t ret; + if (buffer->buffer_pointer + 2 > buffer->buffer_end) return 0; + memcpy(&ret, buffer->buffer_pointer, 2); + *buffer->buffer_pointer += 2; + return net_order_16(ret); +} + +uint64_t serializer_get_uint64(serialized_buffer_t *buffer) +{ + uint64_t ret; + if (buffer->buffer_pointer + 8 > buffer->buffer_end) return 0; + memcpy(&ret, buffer->buffer_pointer, 8); + *buffer->buffer_pointer += 8; + return net_order_64(ret); +} + +char* serializer_get_string(serialized_buffer_t *buffer) +{ + char *ptr = buffer->buffer_pointer, *start = buffer->buffer_pointer; + while (ptr < buffer->buffer_end && *ptr) ++ptr; + if (*ptr) return NULL; // String did not terminate within buffer (possibly corrupted/malicious packet) + buffer->buffer_pointer = ptr + 1; + return start; +} + +void serializer_put_uint16(serialized_buffer_t *buffer, uint16_t value) +{ + if (buffer->buffer_pointer + 2 > buffer->buffer_end) return; + value = net_order_16(value); + memcpy(buffer->buffer_pointer, &value, 2); + buffer->buffer_pointer += 2; +} + +void serializer_put_uint64(serialized_buffer_t *buffer, uint64_t value) +{ + if (buffer->buffer_pointer + 8 > buffer->buffer_end) return; + value = net_order_64(value); + memcpy(buffer->buffer_pointer, &value, 8); + buffer->buffer_pointer += 8; +} + +void serializer_put_string(serialized_buffer_t *buffer, char *value) +{ + size_t len = strlen(value) + 1; + if (buffer->buffer_pointer + len > buffer->buffer_end) return; + memcpy(buffer->buffer_pointer, value, len); + buffer->buffer_pointer += len; +} + +ssize_t serializer_get_written_length(serialized_buffer_t *buffer) +{ + return buffer->buffer_pointer - buffer->buffer; +} |