#include "pb_decode.h"
#include <string.h>
-const pb_decoder_t PB_DECODERS[16] = {
- &pb_dec_uint32,
- &pb_dec_sint32,
- &pb_dec_fixed32,
- &pb_dec_uint64,
- &pb_dec_sint64,
- &pb_dec_fixed64,
- &pb_dec_bool,
- &pb_dec_enum,
+const pb_decoder_t PB_DECODERS[PB_LTYPES_COUNT] = {
+ (pb_decoder_t)&pb_dec_varint,
+ (pb_decoder_t)&pb_dec_svarint,
+ (pb_decoder_t)&pb_dec_fixed,
- &pb_dec_float,
- &pb_dec_double,
-
- &pb_dec_bytes,
- &pb_dec_string,
- &pb_dec_submessage
+ (pb_decoder_t)&pb_dec_bytes,
+ (pb_decoder_t)&pb_dec_string,
+ (pb_decoder_t)&pb_dec_submessage
};
-////////////////////////
-// Helper functions
-////////////////////////
+/**************
+ * pb_istream *
+ **************/
+
+bool pb_read(pb_istream_t *stream, uint8_t *buf, size_t count)
+{
+ bool status;
+ if (stream->bytes_left < count)
+ return false;
+
+ status = stream->callback(stream, buf, count);
+ stream->bytes_left -= count;
+ return status;
+}
static bool buf_read(pb_istream_t *stream, uint8_t *buf, size_t count)
{
pb_istream_t pb_istream_from_buffer(uint8_t *buf, size_t bufsize)
{
- pb_istream_t stream = {&buf_read, buf, bufsize};
+ pb_istream_t stream;
+ stream.callback = &buf_read;
+ stream.state = buf;
+ stream.bytes_left = bufsize;
return stream;
}
+/********************
+ * Helper functions *
+ ********************/
+
bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest)
{
uint64_t temp;
- if (!pb_decode_varint64(stream, &temp))
- return false;
+ bool status = pb_decode_varint64(stream, &temp);
*dest = temp;
- return true;
+ return status;
}
bool pb_decode_varint64(pb_istream_t *stream, uint64_t *dest)
}
}
-// Read a raw value to buffer, for the purpose of passing it to callback.
-// Size is maximum size on call, and actual size on return.
+/* Read a raw value to buffer, for the purpose of passing it to callback.
+ * Size is maximum size on call, and actual size on return. */
static bool read_raw_value(pb_istream_t *stream, int wire_type, uint8_t *buf, size_t *size)
{
size_t max_size = *size;
{
(*size)++;
if (*size > max_size) return false;
- if (!pb_read(stream, buf++, 1)) return false;
- } while (*buf & 0x80);
+ if (!pb_read(stream, buf, 1)) return false;
+ } while (*buf++ & 0x80);
return true;
case WT_64BIT:
}
}
-// Decode string length from stream and return a substream with limited length
+/* Decode string length from stream and return a substream with limited length */
static bool make_string_substream(pb_istream_t *stream, pb_istream_t *substream)
{
uint32_t size;
case PB_HTYPE_ARRAY:
if (wire_type == WT_STRING
- && PB_LTYPE(field->type) != PB_LTYPE_BYTES
- && PB_LTYPE(field->type) != PB_LTYPE_STRING
- && PB_LTYPE(field->type) != PB_LTYPE_SUBMESSAGE)
+ && PB_LTYPE(field->type) <= PB_LTYPE_LAST_PACKABLE)
{
- // Packed array
+ /* Packed array */
size_t *size = (size_t*)pSize;
pb_istream_t substream;
if (!make_string_substream(stream, &substream))
while (substream.bytes_left && *size < field->array_size)
{
- void *pItem = pData + field->data_size * (*size);
+ void *pItem = (uint8_t*)pData + field->data_size * (*size);
if (!func(stream, field, pItem))
return false;
(*size)++;
}
else
{
- // Repeated field
+ /* Repeated field */
size_t *size = (size_t*)pSize;
+ void *pItem = (uint8_t*)pData + field->data_size * (*size);
if (*size >= field->array_size)
return false;
- void *pItem = pData + field->data_size * (*size);
(*size)++;
return func(stream, field, pItem);
}
if (!pCallback->funcs.decode(&substream, field, pCallback->arg))
return false;
}
+ return true;
}
else
{
- // Copy the single scalar value to stack.
- // This is required so that we can limit the stream length,
- // which in turn allows to use same callback for packed and
- // not-packed fields.
+ /* Copy the single scalar value to stack.
+ * This is required so that we can limit the stream length,
+ * which in turn allows to use same callback for packed and
+ * not-packed fields. */
+ pb_istream_t substream;
+ pb_callback_t *pCallback = (pb_callback_t*)pData;
uint8_t buffer[10];
size_t size = sizeof(buffer);
+
if (!read_raw_value(stream, wire_type, buffer, &size))
return false;
- pb_istream_t substream = pb_istream_from_buffer(buffer, size);
+ substream = pb_istream_from_buffer(buffer, size);
- pb_callback_t *pCallback = (pb_callback_t*)pData;
return pCallback->funcs.decode(&substream, field, pCallback->arg);
}
bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
{
- // Used to check for required fields
+ /* Used to check for required fields */
uint32_t fields_seen = 0;
int i;
- // Initialize size/has fields and apply default values
+ /* Initialize size/has fields and apply default values */
for (i = 0; fields[i].tag != 0; i++)
{
void *pData = (char*)dest_struct + fields[i].data_offset;
if (PB_HTYPE(fields[i].type) == PB_HTYPE_OPTIONAL)
{
*(bool*)pSize = false;
- }
- else if (PB_HTYPE(fields[i].type) == PB_HTYPE_ARRAY)
- {
- *(size_t*)pSize = 0;
- }
-
- if (PB_HTYPE(fields[i].type) != PB_HTYPE_ARRAY &&
- PB_HTYPE(fields[i].type) != PB_HTYPE_CALLBACK)
- {
+
+ /* Initialize to default value */
if (fields[i].ptr != NULL)
- {
memcpy(pData, fields[i].ptr, fields[i].data_size);
- }
else
- {
memset(pData, 0, fields[i].data_size);
- }
+ }
+ else if (PB_HTYPE(fields[i].type) == PB_HTYPE_ARRAY)
+ {
+ *(size_t*)pSize = 0;
}
}
while (stream->bytes_left)
{
uint32_t temp;
+ int tag, wire_type;
if (!pb_decode_varint32(stream, &temp))
return false;
- int tag = temp >> 3;
- int wire_type = temp & 7;
+ tag = temp >> 3;
+ wire_type = temp & 7;
i = 0;
while (fields[i].tag != 0 && fields[i].tag != tag)
i++;
}
- if (fields[i].tag == 0) // No match found, skip data
+ if (fields[i].tag == 0) /* No match found, skip data */
{
skip(stream, wire_type);
continue;
return false;
}
- // Check that all required fields (mod 31) were present.
+ /* Check that all required fields (mod 31) were present. */
for (i = 0; fields[i].tag != 0; i++)
{
if (PB_HTYPE(fields[i].type) == PB_HTYPE_REQUIRED &&
/* Field decoders */
-bool pb_dec_uint32(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- return pb_decode_varint32(stream, (uint32_t*)dest);
-}
-
-bool pb_dec_sint32(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- uint32_t *x = (uint32_t*)dest;
- bool status = pb_decode_varint32(stream, x);
- *x = (*x >> 1) ^ -(int32_t)(*x & 1);
- return status;
-}
-
-bool pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, void *dest)
+/* Copy destsize bytes from src so that values are casted properly.
+ * On little endian machine, copy first n bytes of src
+ * On big endian machine, copy last n bytes of src
+ * srcsize must always be larger than destsize
+ */
+static void endian_copy(void *dest, void *src, size_t destsize, size_t srcsize)
{
- uint8_t bytes[4] = {0};
- bool status = pb_read(stream, bytes, 4);
-
#ifdef __BIG_ENDIAN__
- uint8_t lebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]};
- memcpy(dest, lebytes, 4);
+ memcpy(dest, (char*)src + (srcsize - destsize), destsize);
#else
- memcpy(dest, bytes, 4);
+ memcpy(dest, src, destsize);
#endif
- return status;
}
-bool pb_dec_uint64(pb_istream_t *stream, const pb_field_t *field, void *dest)
+bool pb_dec_varint(pb_istream_t *stream, const pb_field_t *field, void *dest)
{
- return pb_decode_varint64(stream, (uint64_t*)dest);
+ uint64_t temp;
+ bool status = pb_decode_varint64(stream, &temp);
+ endian_copy(dest, &temp, field->data_size, sizeof(temp));
+ return status;
}
-bool pb_dec_sint64(pb_istream_t *stream, const pb_field_t *field, void *dest)
+bool pb_dec_svarint(pb_istream_t *stream, const pb_field_t *field, void *dest)
{
- uint64_t *x = (uint64_t*)dest;
- bool status = pb_decode_varint64(stream, x);
- *x = (*x >> 1) ^ -(int64_t)(*x & 1);
+ uint64_t temp;
+ bool status = pb_decode_varint64(stream, &temp);
+ temp = (temp >> 1) ^ -(int64_t)(temp & 1);
+ endian_copy(dest, &temp, field->data_size, sizeof(temp));
return status;
}
-bool pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, void *dest)
+bool pb_dec_fixed(pb_istream_t *stream, const pb_field_t *field, void *dest)
{
uint8_t bytes[8] = {0};
- bool status = pb_read(stream, bytes, 8);
+ bool status = pb_read(stream, bytes, field->data_size);
#ifdef __BIG_ENDIAN__
uint8_t lebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4],
bytes[3], bytes[2], bytes[1], bytes[0]};
- memcpy(dest, lebytes, 4);
+ endian_copy(dest, lebytes, field->data_size, 8);
#else
- memcpy(dest, bytes, 4);
+ endian_copy(dest, bytes, field->data_size, 8);
#endif
return status;
}
-bool pb_dec_bool(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- uint32_t temp = 0;
- bool status = pb_decode_varint32(stream, &temp);
- *(bool*)dest = !!temp;
- return status;
-}
-
-bool pb_dec_enum(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- // Enum sizes can vary, copy only data_size amount of bytes.
- uint32_t temp = 0;
- bool status = pb_decode_varint32(stream, &temp);
- memcpy(dest, &temp, field->data_size);
- return status;
-}
-
-bool pb_dec_float(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- return pb_read(stream, (uint8_t*)dest, sizeof(float));
-}
-
-bool pb_dec_double(pb_istream_t *stream, const pb_field_t *field, void *dest)
-{
- return pb_read(stream, (uint8_t*)dest, sizeof(double));
-}
-
-bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, void *dest)
+bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, uint8_t *dest)
{
pb_bytes_array_t *x = (pb_bytes_array_t*)dest;
return false;
x->size = temp;
- // Note: data_size includes the size of the x.size field, too.
- // Calculate actual size starting from offset.
+ /* Note: data_size includes the size of the x.size field, too.
+ * Calculate actual size starting from offset. */
if (x->size > field->data_size - offsetof(pb_bytes_array_t, bytes))
return false;
return pb_read(stream, x->bytes, x->size);
}
-bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, void *dest)
+bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, uint8_t *dest)
{
uint32_t size;
+ bool status;
if (!pb_decode_varint32(stream, &size))
return false;
if (size > field->data_size - 1)
return false;
- bool status = pb_read(stream, (uint8_t*)dest, size);
+ status = pb_read(stream, (uint8_t*)dest, size);
*((uint8_t*)dest + size) = 0;
return status;
}
Code Review / apps / low-level-can-service.git / blobdiff