test_decode_callbacks test_encode_callbacks \
test_missing_fields test_no_messages test_funny_name \
test_multiple_files test_cxxcompile test_options \
- bc_encode bc_decode test_encode_extensions
+ bc_encode bc_decode test_encode_extensions test_decode_extensions
# More strict checks for the core part of nanopb
CC_VERSION=$(shell $(CC) -v 2>&1)
bc_encode: bc_alltypes.pb.o pb_encode.o bc_encode.o
bc_decode: bc_alltypes.pb.o pb_decode.o bc_decode.o
test_encode_extensions: test_encode_extensions.c pb_encode.o alltypes.pb.o extensions.pb.o
+test_decode_extensions: test_decode_extensions.c pb_decode.o alltypes.pb.o extensions.pb.o
%.pb: %.proto
protoc -I. -I../generator -I/usr/include -o$@ $<
./test_encode3_buf 1 | ./test_decode3_buf 1
./test_decode3 < alltypes_with_extra_fields.pb
./bc_encode | ./bc_decode
+ ./test_encode_extensions | ./test_decode_extensions
./test_missing_fields
--- /dev/null
+/* Test decoding of extension fields. */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pb_decode.h>
+#include "alltypes.pb.h"
+#include "extensions.pb.h"
+
+int main(int argc, char **argv)
+{
+ uint8_t buffer[1024];
+ size_t count = fread(buffer, 1, sizeof(buffer), stdin);
+ pb_istream_t stream = pb_istream_from_buffer(buffer, count);
+
+ AllTypes alltypes = {};
+ int32_t extensionfield1;
+ pb_extension_t ext1 = {&AllTypes_extensionfield1, &extensionfield1, NULL};
+ alltypes.extensions = &ext1;
+
+ if (!pb_decode(&stream, AllTypes_fields, &alltypes))
+ {
+ printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
+ return 1;
+ }
+
+ if (extensionfield1 != 12345)
+ {
+ printf("Wrong value for extension field: %d\n", extensionfield1);
+ return 2;
+ }
+
+ return 0;
+}
+
int main(int argc, char **argv)
{
- AllTypes alltypes = {0};
+ AllTypes alltypes = {};
int32_t extensionfield1 = 12345;
pb_extension_t ext1 = {&AllTypes_extensionfield1, &extensionfield1, NULL};