Publishing nanopb-0.1.8

Update issue 44
Status: FixedInGit

CHANGELOG

@@ -0,0 +1,53 @@
+nanopb-0.1.8
+ Fix bugs in the enum short names introduced in 0.1.7 (issues 42, 43)
+ Fix STATIC_ASSERT macro when using multiple .proto files. (issue 41)
+ Fix missing initialization of istream.errmsg
+ Make tests/Makefile work for non-gcc compilers (issue 40)
+
+nanopb-0.1.7
+ Remove "skip" mode from pb_istream_t callbacks. Example implementation had a bug. (issue 37)
+ Add option to use shorter names for enum values (issue 38)
+ Improve options support in generator (issues 12, 30)
+ Add nanopb version number to generated files (issue 36)
+ Add extern "C" to generated headers (issue 35)
+ Add names for structs to allow forward declaration (issue 39)
+ Add buffer size check in example (issue 34)
+ Fix build warnings on MS compilers (issue 33)
+
+nanopb-0.1.6
+ Reorganize the field decoder interface (issue 2)
+ Improve performance in submessage decoding (issue 28)
+ Implement error messages in the decoder side (issue 7)
+ Extended testcases (alltypes test is now complete).
+ Fix some compiler warnings (issues 25, 26, 27, 32).
+
+nanopb-0.1.5
+ Fix bug in decoder with packed arrays (issue 23).
+ Extended testcases.
+ Fix some compiler warnings.
+
+nanopb-0.1.4
+ Add compile-time options for easy-to-use >255 field support.
+ Improve the detection of missing required fields.
+ Added example on how to handle union messages.
+ Fix generator error with .proto without messages.
+ Fix problems that stopped the code from compiling with some compilers.
+ Fix some compiler warnings.
+
+nanopb-0.1.3
+ Refactor the field encoder interface.
+ Improve generator error messages (issue 5)
+ Add descriptor.proto into the #include exclusion list
+ Fix some compiler warnings.
+
+nanopb-0.1.2
+ Make the generator to generate include for other .proto files (issue 4).
+ Fixed generator not working on Windows (issue 3)
+
+nanopb-0.1.1
+ Fixed bug in encoder with 'bytes' fields (issue 1).
+ Fixed a bug in the generator that caused a compiler error on sfixed32 and sfixed64 fields.
+ Extended testcases.
+
+nanopb-0.1.0
+ First stable release.

LICENSE

@@ -1,5 +1,4 @@
 Copyright (c) 2011 Petteri Aimonen <jpa at nanopb.mail.kapsi.fi>
-Copyright (c) 2011 Michael Poole <mdpoole@troilus.org>
 
 This software is provided 'as-is', without any express or 
 implied warranty. In no event will the authors be held liable 

README

@@ -5,5 +5,7 @@ Homepage: http://kapsi.fi/~jpa/nanopb/
 To compile the library, you'll need these libraries:
 protobuf-compiler python-protobuf libprotobuf-dev
 
+The only runtime dependencies are memset() and memcpy().
+
 To run the tests, run make under the tests folder.
 If it completes without error, everything is fine.

docs/concepts.rst

@@ -38,6 +38,20 @@ This file, in turn, requires the file *google/protobuf/descriptor.proto*. This i
 
     protoc -I/usr/include -Inanopb/generator -I. -omessage.pb message.proto
 
+The options can be defined in file, message and field scopes::
+
+    option (nanopb_fileopt).max_size = 20; // File scope
+    message Message
+    {
+        option (nanopb_msgopt).max_size = 30; // Message scope
+        required string fieldsize = 1 [(nanopb).max_size = 40]; // Field scope
+    }
+
+It is also possible to give the options on command line, but then they will affect the whole file. For example::
+
+    user@host:~$ python ../generator/nanopb_generator.py -s 'max_size: 20' message.pb
+
+
 Streams
 =======
 
@@ -50,6 +64,7 @@ There are a few generic rules for callback functions:
 #) Use state to store your own data, such as a file descriptor.
 #) *bytes_written* and *bytes_left* are updated by pb_write and pb_read.
 #) Your callback may be used with substreams. In this case *bytes_left*, *bytes_written* and *max_size* have smaller values than the original stream. Don't use these values to calculate pointers.
+#) Always read or write the full requested length of data. For example, POSIX *recv()* needs the *MSG_WAITALL* parameter to accomplish this.
 
 Output streams
 --------------
@@ -74,7 +89,7 @@ This is the way to get the size of the message without storing it anywhere::
 
  Person myperson = ...;
  pb_ostream_t sizestream = {0};
- pb_encode(&sizestream, Person_msg, &myperson);
+ pb_encode(&sizestream, Person_fields, &myperson);
  printf("Encoded size is %d\n", sizestream.bytes_written);
 
 **Example 2:**
@@ -91,9 +106,8 @@ Writing to stdout::
 
 Input streams
 -------------
-For input streams, there are a few extra rules:
+For input streams, there is one extra rule:
 
-#) If buf is NULL, read from stream but don't store the data. This is used to skip unknown input.
 #) You don't need to know the length of the message in advance. After getting EOF error when reading, set bytes_left to 0 and return false. Pb_decode will detect this and if the EOF was in a proper position, it will return true.
 
 Here is the structure::
@@ -142,7 +156,6 @@ Most Protocol Buffers datatypes have directly corresponding C datatypes, such as
 1) Strings, bytes and repeated fields of any type map to callback functions by default.
 2) If there is a special option *(nanopb).max_size* specified in the .proto file, string maps to null-terminated char array and bytes map to a structure containing a char array and a size field.
 3) If there is a special option *(nanopb).max_count* specified on a repeated field, it maps to an array of whatever type is being repeated. Another field will be created for the actual number of entries stored.
-4) The option *(nanopb).pointer* can override the default (false, unless the *-p* option is passed to *nanopb_generator.py*) behavior.  If a string, byte, or submessage is generated as a pointer field, and it is repeated (with a maximum count), required, or optional, the members will be pointers rather than in-line data.
 
 =============================================================================== =======================
       field in .proto                                                           autogenerated in .h
@@ -157,18 +170,12 @@ required bytes data = 1 [(nanopb).max_size = 40];
                                                                                 |    uint8_t bytes[40];
                                                                                 | } Person_data_t;
                                                                                 | Person_data_t data;
-required string name = 1 [(nanopb).pointer = true];                             char \*name;
-required bytes data = 1 [(nanopb).pointer = true];                              pb_bytes_t data;
-required bytes data = 1 [(nanopb).pointer = true, (nanopb).max_count = 5];      | size_t data_count;
-                                                                                | pb_bytes_t data[5];
-required Message msg = 1 [(nanopb).pointer = true];                             Message \*msg;
 =============================================================================== =======================
 
-The maximum lengths are checked in runtime. If string/bytes/array exceeds the allocated length, *pb_decode* will return false. 
+The maximum lengths are checked in runtime. If string/bytes/array exceeds the allocated length, *pb_decode* will return false.
 
-If a pointer-type field is not received, the field will be marked as absent, but the pointer will not be modified.  This helps reduce memory fragmentation and churn, but increases worst-case memory usage and means you must use the *Message_has(object, Field)* macro rather than testing for a null pointer.  You can use the `pb_clean`_ function to release unused memory in these cases.
-
-.. _`pb_clean`: reference.html#pb-clean
+Note: for the *bytes* datatype, the field length checking may not be exact.
+The compiler may add some padding to the *pb_bytes_t* structure, and the nanopb runtime doesn't know how much of the structure size is padding. Therefore it uses the whole length of the structure for storing data, which is not very smart but shouldn't cause problems. In practise, this means that if you specify *(nanopb).max_size=5* on a *bytes* field, you may be able to store 6 bytes there. For the *string* field type, the length limit is exact.
 
 Field callbacks
 ===============
@@ -183,20 +190,16 @@ Encoding callbacks
 ::
 
     bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, const void *arg);
-    bool (*encode_buffer)(pb_strstream_t *stream, const pb_field_t *field, const void *arg);
 
-When encoding, the callbacks should write out complete fields, including the wire type and field number tag. The callback can write as many or as few fields as it likes. For example, if you want to write out an array as *repeated* field, you should do it all in a single call.
+When encoding, the callback should write out complete fields, including the wire type and field number tag. It can write as many or as few fields as it likes. For example, if you want to write out an array as *repeated* field, you should do it all in a single call.
 
-Usually you can use `pb_encode_tag_for_field`_ (or `pb_encbuf_tag_for_field`_ for the *encode_buffer* callback) to encode the wire type and tag number of the field. However, if you want to encode a repeated field as a packed array, you must call `pb_encode_tag`_ (respectively, `pb_encbuf_tag`_) instead to specify a wire type of *PB_WT_STRING*.
+Usually you can use `pb_encode_tag_for_field`_ to encode the wire type and tag number of the field. However, if you want to encode a repeated field as a packed array, you must call `pb_encode_tag`_ instead to specify a wire type of *PB_WT_STRING*.
 
-If the callback is used in a submessage, *encode* will be called multiple times during a single call to `pb_encode`_. In this case, it must produce the same amount of data every time. If the callback is directly in the main message, or if you are using `pb_encode_buffer`_, the callback is called only once.
+If the callback is used in a submessage, it will be called multiple times during a single call to `pb_encode`_. In this case, it must produce the same amount of data every time. If the callback is directly in the main message, it is called only once.
 
 .. _`pb_encode`: reference.html#pb-encode
-.. _`pb_encode_buffer`: reference.html#pb-encode-buffer
 .. _`pb_encode_tag_for_field`: reference.html#pb-encode-tag-for-field
-.. _`pb_encbuf_tag_for_field`: reference.html#pb-encbuf-tag-for-field
 .. _`pb_encode_tag`: reference.html#pb-encode-tag
-.. _`pb_encbuf_tag`: reference.html#pb-encbuf-tag
 
 This callback writes out a dynamically sized string::
 
@@ -209,17 +212,6 @@ This callback writes out a dynamically sized string::
         return pb_encode_string(stream, (uint8_t*)str, strlen(str));
     }
 
-The equivalent for in-memory buffers has to write the elements in the opposite order, because the buffer writers prepend their data::
-
-    bool write_string_buf(pb_strstream_t *stream, const pb_field_t *field, const void *arg)
-    {
-        char *str = get_string_from_somewhere();
-        if (!pb_encbuf_string(stream, (uint8_t*)str, strlen(str)))
-            return false;
-        
-        return pb_encbuf_tag_for_field(stream, field));
-    }
-
 Decoding callbacks
 ------------------
 ::
@@ -246,10 +238,10 @@ This callback reads multiple integers and prints them::
         return true;
     }
 
-Message descriptor
-==================
+Field description array
+=======================
 
-For using the *pb_encode*, *pb_encode_buffer* and *pb_decode* functions, you need a message descriptor describing the structure you wish to encode. This description is usually autogenerated from .proto file.
+For using the *pb_encode* and *pb_decode* functions, you need an array of pb_field_t constants describing the structure you wish to encode. This description is usually autogenerated from .proto file.
 
 For example this submessage in the Person.proto file::
 
@@ -260,67 +252,34 @@ For example this submessage in the Person.proto file::
     }
  }
 
-generates these declarations and definitions for the structure *Person_PhoneNumber*::
-
- typedef PB_MSG_STRUCT(2) Person_PhoneNumber_msg_t;
- extern const Person_PhoneNumber_msg_t Person_PhoneNumber_real_msg;
- #define Person_PhoneNumber_msg ((const pb_message_t*)&Person_PhoneNumber_real_msg)
-
- const Person_PhoneNumber_msg_t Person_PhoneNumber_real_msg = {
-    2,
-    {
+generates this field description array for the structure *Person_PhoneNumber*::
 
+ const pb_field_t Person_PhoneNumber_fields[3] = {
     {1, PB_HTYPE_REQUIRED | PB_LTYPE_STRING,
     offsetof(Person_PhoneNumber, number), 0,
     pb_membersize(Person_PhoneNumber, number), 0, 0},
 
     {2, PB_HTYPE_OPTIONAL | PB_LTYPE_VARINT,
-    pb_delta_end(Person_PhoneNumber, type, number), 0,
+    pb_delta(Person_PhoneNumber, type, number),
+    pb_delta(Person_PhoneNumber, has_type, type),
     pb_membersize(Person_PhoneNumber, type), 0,
     &Person_PhoneNumber_type_default},
 
-    }
+    PB_LAST_FIELD
  };
 
- #define Person_PhoneNumber_has(STRUCT, FIELD) PB_HAS_FIELD(STRUCT, Person_PhoneNumber, FIELD)
- #define Person_PhoneNumber_set(STRUCT, FIELD) PB_SET_FIELD(STRUCT, Person_PhoneNumber, FIELD)
- #define Person_PhoneNumber_clear(STRUCT, FIELD) PB_CLEAR_FIELD(STRUCT, Person_PhoneNumber, FIELD)
- #define Person_PhoneNumber_number_index 0
- #define Person_PhoneNumber_number_tag 1
- #define Person_PhoneNumber_type_index 1
- #define Person_PhoneNumber_type_tag 2
-
-Optional Fields
-===============
-
-The *has_fields* member of each generated structure is an array where
-each bit indicates the presence of the corresponding (optional) field.
-The generated header file provides helper macros to read and update
-that array; in the previous example, they are
-*Person_PhoneNumber_has*, *Person_PhoneNumber_set* and
-*Person_PhoneNumber_clear*.
-
-For convenience, *pb_encode* and *pb_encode_buffer* only check these
-bits for optional fields.  *pb_decode* sets the corresponding bit for
-every field it decodes, whether the field is optional or not.
-
-.. Should there be a section here on pointer fields?
 
 Return values and error handling
 ================================
 
-Most functions in nanopb return bool: *true* means success, *false* means failure. If this is enough for you, skip this section.
+Most functions in nanopb return bool: *true* means success, *false* means failure. There is also some support for error messages for debugging purposes: the error messages go in *stream->errmsg*.
 
-For simplicity, nanopb doesn't define it's own error codes. This might be added if there is a compelling need for it. You can however deduce something about the error causes:
+The error messages help in guessing what is the underlying cause of the error. The most common error conditions are:
 
 1) Running out of memory. Because everything is allocated from the stack, nanopb can't detect this itself. Encoding or decoding the same type of a message always takes the same amount of stack space. Therefore, if it works once, it works always.
 2) Invalid field description. These are usually stored as constants, so if it works under the debugger, it always does.
-3) IO errors in your own stream callbacks. Because encoding/decoding stops at the first error, you can overwrite the *state* field in the struct and store your own error code there.
-4) Errors that happen in your callback functions. You can use the state field in the callback structure.
+3) IO errors in your own stream callbacks.
+4) Errors that happen in your callback functions.
 5) Exceeding the max_size or bytes_left of a stream.
 6) Exceeding the max_size of a string or array field
-7) Invalid protocol buffers binary message. It's not like you could recover from it anyway, so a simple failure should be enough.
-
-In my opinion, it is enough that 1. and 2. can be resolved using a debugger.
-
-However, you may be interested which of the remaining conditions caused the error. For 3. and 4., you can set and check the state. If you have to detect 5. and 6., you should convert the fields to callback type. Any remaining problem is of type 7.
+7) Invalid protocol buffers binary message.

docs/index.rst

@@ -14,9 +14,6 @@ Overall structure
 
 For the runtime program, you always need *pb.h* for type declarations.
 Depending on whether you want to encode, decode, or both, you also need *pb_encode.h/c* or *pb_decode.h/c*.
-If you only encode into in-memory buffers, *pb_decode_buffer.h/c* should be slightly faster and smaller.
-
-If your *.proto* file encodes submessages or other fields using pointers, you must compile *pb_decode.c* with a preprocessor macro named *MALLOC_HEADER* that is the name of a header with definitions (either as functions or macros) for *calloc()*, *realloc()* and *free()*.  For a typical hosted configuration, this should be *<stdlib.h>*.
 
 The high-level encoding and decoding functions take an array of *pb_field_t* structures, which describes the fields of a message structure. Usually you want these autogenerated from a *.proto* file. The tool script *nanopb_generator.py* accomplishes this.
 
@@ -28,10 +25,9 @@ So a typical project might include these files:
     - pb.h
     - pb_decode.h and pb_decode.c (needed for decoding messages)
     - pb_encode.h and pb_encode.c (needed for encoding messages)
-    - pb_encode_buffer.h and pb_encode_buffer.c (for encoding specifically into in-memory buffers)
 2) Protocol description (you can have many):
     - person.proto (just an example)
-    - person.pb.c (autogenerated, contains initializers for message descriptors)
+    - person.pb.c (autogenerated, contains initializers for const arrays)
     - person.pb.h (autogenerated, contains type declarations)
 
 Features and limitations
@@ -56,7 +52,7 @@ Features and limitations
 #) Unknown fields are not preserved when decoding and re-encoding a message.
 #) Reflection (runtime introspection) is not supported. E.g. you can't request a field by giving its name in a string.
 #) Numeric arrays are always encoded as packed, even if not marked as packed in .proto. This causes incompatibility with decoders that do not support packed format.
-#) Limited support for cyclic references between messages.  (The cycle must be broken by making one of the references a pointer or callback field, and objects that have circular references are not detected when encoding.)
+#) Cyclic references between messages are not supported. They could be supported in callback-mode if there was an option in the generator to set the mode.
 
 Getting started
 ===============
@@ -78,30 +74,17 @@ You should now have in *message.pb.h*::
     int32_t value;
  } Example;
  
- typedef PB_MSG_STRUCT(1) Example_msg_t;
- extern const Example_msg_t Example_real_msg;
- #define Example_msg ((const pb_message_t*)&Example_real_msg)
+ extern const pb_field_t Example_fields[2];
 
 Now in your main program do this to encode a message::
 
  Example mymessage = {42};
  uint8_t buffer[10];
  pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
- pb_encode(&stream, Example_msg, &mymessage);
+ pb_encode(&stream, Example_fields, &mymessage);
 
 After that, buffer will contain the encoded message.
 The number of bytes in the message is stored in *stream.bytes_written*.
-
-Using *pb_encode_buffer.h/c* interface is very similar::
-
- Example mymessage = {42};
- uint8_t buffer[10];
- pb_strstream_t stream = pb_str_from_buffer(buffer, sizeof(buffer));
- pb_encode_buffer(&stream, Example_msg, &mymessage);
-
-The encoded message will start at *stream.last* and continue until the
-end of *buffer* (that is, it has length *buffer - stream.last*).
-
 You can feed the message to *protoc --decode=Example message.proto* to verify its validity.
 
 For complete examples of the simple cases, see *tests/test_decode1.c* and *tests/test_encode1.c*. For an example with network interface, see the *example* subdirectory.
@@ -125,5 +108,6 @@ This also generates a file called *breakpoints* which includes all lines returni
 
 Wishlist
 ========
+#) A specialized encoder for encoding to a memory buffer. Should serialize in reverse order to avoid having to determine submessage size beforehand.
 #) A cleaner rewrite of the Python-based source generator.
 #) Better performance for 16- and 8-bit platforms: use smaller datatypes where possible.

docs/menu.rst

@@ -3,11 +3,7 @@
     1) `Overview`_
     2) `Concepts`_
     3) `API reference`_
-
-Note: This is the documentation for the *dynamic_alloc_dev* development branch. See here for the 
-documentation for the latest stable version:
-http://koti.kapsi.fi/~jpa/nanopb/docs/index.html
-
+    
 .. _`Overview`: index.html
 .. _`Concepts`: concepts.html
 .. _`API reference`: reference.html

docs/reference.rst

@@ -6,6 +6,28 @@ Nanopb: API reference
 
 .. contents ::
 
+Compilation options
+===================
+The following options can be specified using -D switch given to the C compiler:
+
+============================  ================================================================================================
+__BIG_ENDIAN__                 Set this if your platform stores integers and floats in big-endian format.
+                               Mixed-endian systems (different layout for ints and floats) are currently not supported.
+NANOPB_INTERNALS               Set this to expose the field encoder functions that are hidden since nanopb-0.1.3.
+PB_MAX_REQUIRED_FIELDS         Maximum number of required fields to check for presence. Default value is 64. Increases stack
+                               usage 1 byte per every 8 fields. Compiler warning will tell if you need this.
+PB_FIELD_16BIT                 Add support for tag numbers > 255 and fields larger than 255 bytes or 255 array entries.
+                               Increases code size 3 bytes per each field. Compiler error will tell if you need this.
+PB_FIELD_32BIT                 Add support for tag numbers > 65535 and fields larger than 65535 bytes or 65535 array entries.
+                               Increases code size 9 bytes per each field. Compiler error will tell if you need this.
+PB_NO_ERRMSG                   Disables the support for error messages; only error information is the true/false return value.
+                               Decreases the code size by a few hundred bytes.
+============================  ================================================================================================
+
+The PB_MAX_REQUIRED_FIELDS, PB_FIELD_16BIT and PB_FIELD_32BIT settings allow raising some datatype limits to suit larger messages.
+Their need is recognized automatically by C-preprocessor #if-directives in the generated .pb.h files. The default setting is to use
+the smallest datatypes (least resources used).
+
 pb.h
 ====
 
@@ -13,9 +35,9 @@ pb_type_t
 ---------
 Defines the encoder/decoder behaviour that should be used for a field. ::
 
-    typedef uint8_t pb_type_t;
+    typedef enum { ... } pb_type_t;
 
-The low-order nibble of the enumeration values defines the function that can be used for encoding and decoding the field data:
+The low-order byte of the enumeration values defines the function that can be used for encoding and decoding the field data:
 
 ==================== ===== ================================================
 LTYPE identifier     Value Storage format
@@ -28,23 +50,19 @@ PB_LTYPE_STRING      0x04  Null-terminated string.
 PB_LTYPE_SUBMESSAGE  0x05  Submessage structure.
 ==================== ===== ================================================
 
-The high-order nibble defines whether the field is required, optional, repeated or callback, and whether it is a pointer:
+The high-order byte defines whether the field is required, optional, repeated or callback:
 
 ==================== ===== ================================================
 HTYPE identifier     Value Field handling
 ==================== ===== ================================================
 PB_HTYPE_REQUIRED    0x00  Verify that field exists in decoded message.
-PB_HTYPE_OPTIONAL    0x10  Use the structure's *has_fields* bit array to
-                           specify whether the field is present.
+PB_HTYPE_OPTIONAL    0x10  Use separate *has_<field>* boolean to specify
+                           whether the field is present.
 PB_HTYPE_ARRAY       0x20  A repeated field with preallocated array.
                            Separate *<field>_count* for number of items.
 PB_HTYPE_CALLBACK    0x30  A field with dynamic storage size, data is
                            actually a pointer to a structure containing a
                            callback function.
-PB_HTYPE_POINTER     0x80  For required, optional and array non-scalar
-                           fields, uses a pointer type (char* for strings,
-                           pb_bytes_t for bytes, or a pointer for
-                           submessages).
 ==================== ===== ================================================
 
 pb_field_t
@@ -65,12 +83,12 @@ Describes a single structure field with memory position in relation to others. T
 :tag:           Tag number of the field or 0 to terminate a list of fields.
 :type:          LTYPE and HTYPE of the field.
 :data_offset:   Offset of field data, relative to the end of the previous field.
-:size_offset:   Offset of *size_t* count for arrays, relative to field data.
+:size_offset:   Offset of *bool* flag for optional fields or *size_t* count for arrays, relative to field data.
 :data_size:     Size of a single data entry, in bytes. For PB_LTYPE_BYTES, the size of the byte array inside the containing structure. For PB_HTYPE_CALLBACK, size of the C data type if known.
 :array_size:    Maximum number of entries in an array, if it is an array type.
 :ptr:           Pointer to default value for optional fields, or to submessage description for PB_LTYPE_SUBMESSAGE.
 
-The *uint8_t* datatypes limit the maximum size of a single item to 255 bytes and arrays to 255 items. Compiler will warn "Initializer too large for type" if the limits are exceeded. The types can be changed to larger ones if necessary.
+The *uint8_t* datatypes limit the maximum size of a single item to 255 bytes and arrays to 255 items. Compiler will give error if the values are too large. The types can be changed to larger ones by defining *PB_FIELD_16BIT*.
 
 pb_bytes_array_t
 ----------------
@@ -83,16 +101,6 @@ An byte array with a field for storing the length::
 
 In an actual array, the length of *bytes* may be different.
 
-pb_bytes_t
-----------
-A byte array with fields for storing the allocated and current lengths::
-
-    typedef struct {
-        size_t alloced;
-        size_t size;
-        uint8_t *bytes;
-    } pb_bytes_array_t;
-
 pb_callback_t
 -------------
 Part of a message structure, for fields with type PB_HTYPE_CALLBACK::
@@ -102,7 +110,6 @@ Part of a message structure, for fields with type PB_HTYPE_CALLBACK::
         union {
             bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void *arg);
             bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, const void *arg);
-            bool (*encode_buffer)(pb_strstream_t *stream, const pb_field_t *field, const void *arg);
         } funcs;
         
         void *arg;
@@ -110,11 +117,11 @@ Part of a message structure, for fields with type PB_HTYPE_CALLBACK::
 
 The *arg* is passed to the callback when calling. It can be used to store any information that the callback might need.
 
-When calling `pb_encode`_, *funcs.encode* is used, and similarly when calling `pb_encode_buffer`_, *funcs.encode_buffer* is used, and when calling `pb_decode`_, *funcs.decode* is used. The function pointers are stored in the same memory location but are of incompatible types. You can set the function pointer to NULL to skip the field.
+When calling `pb_encode`_, *funcs.encode* is used, and similarly when calling `pb_decode`_, *funcs.decode* is used. The function pointers are stored in the same memory location but are of incompatible types. You can set the function pointer to NULL to skip the field.
 
 pb_wire_type_t
 --------------
-Protocol Buffers wire types. These are used with `pb_encode_tag`_ and `pb_encbuf_tag`_. ::
+Protocol Buffers wire types. These are used with `pb_encode_tag`_. ::
 
     typedef enum {
         PB_WT_VARINT = 0,
@@ -155,26 +162,22 @@ pb_encode
 ---------
 Encodes the contents of a structure as a protocol buffers message and writes it to output stream. ::
 
-    bool pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const void *src_struct);
+    bool pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
 
 :stream:        Output stream to write to.
-:msg:           A message descriptor, usually autogenerated.
+:fields:        A field description array, usually autogenerated.
 :src_struct:    Pointer to the data that will be serialized.
 :returns:       True on success, false on IO error, on detectable errors in field description, or if a field encoder returns false.
 
-Normally pb_encode simply walks through the fields description array inside the message descriptor and serializes each field in turn. However, submessages must be serialized twice: first to calculate their size and then to actually write them to output. This causes some constraints for callback fields, which must return the same data on every call.
+Normally pb_encode simply walks through the fields description array and serializes each field in turn. However, submessages must be serialized twice: first to calculate their size and then to actually write them to output. This causes some constraints for callback fields, which must return the same data on every call.
 
-pb_encode_varint
-----------------
-Encodes an unsigned integer in the varint_ format. ::
+.. sidebar:: Encoding fields manually
 
-    bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
+    The functions with names *pb_encode_\** are used when dealing with callback fields. The typical reason for using callbacks is to have an array of unlimited size. In that case, `pb_encode`_ will call your callback function, which in turn will call *pb_encode_\** functions repeatedly to write out values.
 
-:stream:        Output stream to write to. 1-10 bytes will be written.
-:value:         Value to encode.
-:returns:       True on success, false on IO error.
+    The tag of a field must be encoded separately with `pb_encode_tag_for_field`_. After that, you can call exactly one of the content-writing functions to encode the payload of the field. For repeated fields, you can repeat this process multiple times.
 
-.. _varint: http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints
+    Writing packed arrays is a little bit more involved: you need to use `pb_encode_tag` and specify `PB_WT_STRING` as the wire type. Then you need to know exactly how much data you are going to write, and use `pb_encode_varint`_ to write out the number of bytes before writing the actual data. Substreams can be used to determine the number of bytes beforehand; see `pb_encode_submessage`_ source code for an example.
 
 pb_encode_tag
 -------------
@@ -184,7 +187,7 @@ Starts a field in the Protocol Buffers binary format: encodes the field number a
 
 :stream:        Output stream to write to. 1-5 bytes will be written.
 :wiretype:      PB_WT_VARINT, PB_WT_64BIT, PB_WT_STRING or PB_WT_32BIT
-:field_number:  Identifier for the field, defined in the .proto file.
+:field_number:  Identifier for the field, defined in the .proto file. You can get it from field->tag.
 :returns:       True on success, false on IO error.
 
 pb_encode_tag_for_field
@@ -210,208 +213,71 @@ STRING, BYTES, SUBMESSAGE PB_WT_STRING
 FIXED32                   PB_WT_32BIT
 ========================= ============
 
+pb_encode_varint
+----------------
+Encodes a signed or unsigned integer in the varint_ format. Works for fields of type `bool`, `enum`, `int32`, `int64`, `uint32` and `uint64`::
+
+    bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
+
+:stream:        Output stream to write to. 1-10 bytes will be written.
+:value:         Value to encode. Just cast e.g. int32_t directly to uint64_t.
+:returns:       True on success, false on IO error.
+
+.. _varint: http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints
+
+pb_encode_svarint
+-----------------
+Encodes a signed integer in the 'zig-zagged' format. Works for fields of type `sint32` and `sint64`::
+
+    bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
+
+(parameters are the same as for `pb_encode_varint`_
+
 pb_encode_string
 ----------------
-Writes the length of a string as varint and then contents of the string. Used for writing fields with wire type PB_WT_STRING. ::
+Writes the length of a string as varint and then contents of the string. Works for fields of type `bytes` and `string`::
 
     bool pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size);
 
 :stream:        Output stream to write to.
 :buffer:        Pointer to string data.
-:size:          Number of bytes in the string.
+:size:          Number of bytes in the string. Pass `strlen(s)` for strings.
 :returns:       True on success, false on IO error.
 
-.. sidebar:: Field encoders
-
-    The functions with names beginning with *pb_enc_* are called field encoders. Each PB_LTYPE has an own field encoder, which handles translating from C data into Protocol Buffers data.
-
-    By using the *data_size* in the field description and by taking advantage of C casting rules, it has been possible to combine many data types to a single LTYPE. For example, *int32*, *uint32*, *int64*, *uint64*, *bool* and *enum* are all handled by *pb_enc_varint*.
-
-    Each field encoder only encodes the contents of the field. The tag must be encoded separately with `pb_encode_tag_for_field`_.
-
-    You can use the field encoders from your callbacks. Just be aware that the pb_field_t passed to the callback is not directly compatible with most of the encoders. Instead, you must create a new pb_field_t structure and set the data_size according to the data type you pass to *src*.
-
-pb_enc_varint
--------------
-Field encoder for PB_LTYPE_VARINT. Takes the first *field->data_size* bytes from src, casts them as *uint64_t* and calls `pb_encode_varint`_. ::
-
-    bool pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-:stream:        Output stream to write to.
-:field:         Field description structure. Only *data_size* matters.
-:src:           Pointer to start of the field data.
-:returns:       True on success, false on IO error.
-
-pb_enc_svarint
---------------
-Field encoder for PB_LTYPE_SVARINT. Similar to `pb_enc_varint`_, except first zig-zag encodes the value for more efficient negative number encoding. ::
-
-    bool pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-(parameters are the same as for `pb_enc_varint`_)
-
-The number is considered negative if the high-order bit of the value is set. On big endian computers, it is the highest bit of *\*src*. On little endian computers, it is the highest bit of *\*(src + field->data_size - 1)*.
-
-pb_enc_fixed32
---------------
-Field encoder for PB_LTYPE_FIXED32. Writes the data in little endian order. On big endian computers, reverses the order of bytes. ::
-
-    bool pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-:stream:        Output stream to write to.
-:field:         Not used.
-:src:           Pointer to start of the field data.
-:returns:       True on success, false on IO error.
-
-pb_enc_fixed64
---------------
-Field encoder for PB_LTYPE_FIXED64. Writes the data in little endian order. On big endian computers, reverses the order of bytes. ::
-
-    bool pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-(parameters are the same as for `pb_enc_fixed32`_)
-
-The same function is used for both integers and doubles. This breaks encoding of double values on architectures where they are mixed endian (primarily some arm processors with hardware FPU).
-
-pb_enc_bytes
-------------
-Field encoder for PB_LTYPE_BYTES. Just calls `pb_encode_string`_. ::
-
-    bool pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-:stream:        Output stream to write to.
-:field:         Not used.
-:src:           Pointer to a structure similar to pb_bytes_array_t.
-:returns:       True on success, false on IO error.
-
-This function expects a pointer to a structure with a *size_t* field at start, and a variable sized byte array after it. The platform-specific field offset is inferred from *pb_bytes_array_t*, which has a byte array of size 1.
-
-pb_enc_string
--------------
-Field encoder for PB_LTYPE_STRING. Determines size of string with strlen() and then calls `pb_encode_string`_. ::
-
-    bool pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
-:stream:        Output stream to write to.
-:field:         Not used.
-:src:           Pointer to a null-terminated string.
-:returns:       True on success, false on IO error.
-
-pb_enc_submessage
+pb_encode_fixed32
 -----------------
-Field encoder for PB_LTYPE_SUBMESSAGE. Calls `pb_encode`_ to perform the actual encoding. ::
+Writes 4 bytes to stream and swaps bytes on big-endian architectures. Works for fields of type `fixed32`, `sfixed32` and `float`::
 
-    bool pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
+    bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
+
+:stream:    Output stream to write to.
+:value:     Pointer to a 4-bytes large C variable, for example `uint32_t foo;`.
+:returns:   True on success, false on IO error.
+
+pb_encode_fixed64
+-----------------
+Writes 8 bytes to stream and swaps bytes on big-endian architecture. Works for fields of type `fixed64`, `sfixed64` and `double`::
+
+    bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
+
+:stream:    Output stream to write to.
+:value:     Pointer to a 8-bytes large C variable, for example `uint64_t foo;`.
+:returns:   True on success, false on IO error.
+
+pb_encode_submessage
+--------------------
+Encodes a submessage field, including the size header for it. Works for fields of any message type::
+
+    bool pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
 
 :stream:        Output stream to write to.
-:field:         Field description structure. The *ptr* field must be a pointer to a valid *pb_message_t* descriptor for the submessage.
+:fields:        Pointer to the autogenerated field description array for the submessage type, e.g. `MyMessage_fields`.
 :src:           Pointer to the structure where submessage data is.
 :returns:       True on success, false on IO errors, pb_encode errors or if submessage size changes between calls.
 
 In Protocol Buffers format, the submessage size must be written before the submessage contents. Therefore, this function has to encode the submessage twice in order to know the size beforehand.
 
-If the submessage contains callback fields, the callback function might misbehave and write out a different amount of data on the second call. This situation is recognized and *false* is returned, but it is up to the caller to ensure that the receiver of the message does not interpret it as valid data.
-
-pb_encode_buffer.h
-==================
-
-An important note about this module is that data is written from the
-back of the buffer to the front.  That is, when you call
-*pb_buf_write()*, it will place the bytes (in the order you provide
-them) before the data currently in the buffer.
-
-pb_strstream_from_buffer
-------------------------
-Constructs a buffer descriptor. This is just a helper function, it doesn't do anything you couldn't do yourself in a callback function. ::
-
-    pb_strstream_t pb_strstream_from_buffer(uint8_t *buf, size_t bufsize);
-
-:buf:           Memory buffer to write into.
-:bufsize:       Maximum number of bytes to write.
-:returns:       The buffer descriptor.
-
-The descriptor only tracks the amount of space left; it does not count how many bytes have been written.
-
-pb_buf_write
-------------
-Prepends data to an in-memory buffer. Always use this function, instead of trying to manage the pointers inside the buffer descriptor. ::
-
-    bool pb_buf_write(pb_strstream_t *stream, const uint8_t *buf, size_t count);
-
-:stream:        Descriptor for buffer to write to.
-:buf:           Pointer to buffer with the data to be written.
-:count:         Number of bytes to write.
-:returns:       True on success, false if maximum length is exceeded.
-
-If there is not enough space, *stream* is not modified.
-
-pb_encode_buffer
-----------------
-Encodes the contents of a structure as a protocol buffers message and writes it to a buffer. ::
-
-    bool pb_encode_buffer(pb_strstream_t *stream, const pb_message_t *msg, const void *src_struct);
-
-:stream:        Descriptor for buffer to write to.
-:msg:           A message descriptor, usually autogenerated.
-:src_struct:    Pointer to the data that will be serialized.
-:returns:       True on success, false if the buffer is too small or if a field encoder returns false.
-
-pb_encbuf_varint
-----------------
-Encodes an unsigned integer in the varint_ format. ::
-
-    bool pb_encbuf_varint(pb_strstream_t *stream, uint64_t value);
-
-:stream:        Descriptor for buffer to write to. 1-10 bytes will be written.
-:value:         Value to encode.
-:returns:       True on success, false on IO error.
-
-.. _varint: http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints
-
-pb_encbuf_tag
--------------
-Finishes a field in the Protocol Buffers binary format: encodes the field number and the wire type of the data. ::
-
-    bool pb_encbuf_tag(pb_strstream_t *stream, pb_wire_type_t wiretype, int field_number);
-
-:stream:        Descriptor for buffer to write to. 1-5 bytes will be written.
-:wiretype:      PB_WT_VARINT, PB_WT_64BIT, PB_WT_STRING or PB_WT_32BIT
-:field_number:  Identifier for the field, defined in the .proto file.
-:returns:       True on success, false on IO error.
-
-pb_encbuf_tag_for_field
------------------------
-Same as `pb_encbuf_tag`_, except takes the parameters from a *pb_field_t* structure. ::
-
-    bool pb_encbuf_tag_for_field(pb_strstream_t *stream, const pb_field_t *field);
-
-:stream:        Descriptor for buffer to write to. 1-5 bytes will be written.
-:field:         Field description structure. Usually autogenerated.
-:returns:       True on success, false on IO error or unknown field type.
-
-This function only considers the LTYPE of the field. You can use it from your field callbacks, because the source generator writes correct LTYPE also for callback type fields.
-
-Wire type mapping is as follows:
-
-========================= ============
-LTYPEs                    Wire type
-========================= ============
-VARINT, SVARINT           PB_WT_VARINT
-FIXED64                   PB_WT_64BIT  
-STRING, BYTES, SUBMESSAGE PB_WT_STRING 
-FIXED32                   PB_WT_32BIT
-========================= ============
-
-pb_encbuf_string
-----------------
-Writes the length of a string as varint and then contents of the string. Used for writing fields with wire type PB_WT_STRING. ::
-
-    bool pb_encbuf_string(pb_strstream_t *stream, const uint8_t *buffer, size_t size);
-
-:stream:        Descriptor for buffer to write to.
-:buffer:        Pointer to string data.
-:size:          Number of bytes in the string.
-:returns:       True on success, false on IO error.
+If the submessage contains callback fields, the callback function might misbehave and write out a different amount of data on the second call. This situation is recognized and *false* is returned, but garbage will be written to the output before the problem is detected.
 
 pb_decode.h
 ===========
@@ -439,15 +305,32 @@ Read data from input stream. Always use this function, don't try to call the str
 
 End of file is signalled by *stream->bytes_left* being zero after pb_read returns false.
 
-pb_decode_varint
+pb_decode
+---------
+Read and decode all fields of a structure. Reads until EOF on input stream. ::
+
+    bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
+
+:stream:        Input stream to read from.
+:fields:        A field description array. Usually autogenerated.
+:dest_struct:   Pointer to structure where data will be stored.
+:returns:       True on success, false on IO error, on detectable errors in field description, if a field encoder returns false or if a required field is missing.
+
+In Protocol Buffers binary format, EOF is only allowed between fields. If it happens anywhere else, pb_decode will return *false*. If pb_decode returns false, you cannot trust any of the data in the structure.
+
+In addition to EOF, the pb_decode implementation supports terminating a message with a 0 byte. This is compatible with the official Protocol Buffers because 0 is never a valid field tag.
+
+For optional fields, this function applies the default value and sets *has_<field>* to false if the field is not present.
+
+pb_decode_noinit
 ----------------
-Read and decode a varint_ encoded integer. ::
+Same as `pb_decode`_, except does not apply the default values to fields. ::
 
-    bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
+    bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
 
-:stream:        Input stream to read from. 1-10 bytes will be read.
-:dest:          Storage for the decoded integer. Value is undefined on error.
-:returns:       True on success, false if value exceeds uint64_t range or an IO error happens.
+(parameters are the same as for `pb_decode`_.)
+
+The destination structure should be filled with zeros before calling this function. Doing a *memset* manually can be slightly faster than using `pb_decode`_ if you don't need any default values.
 
 pb_skip_varint
 --------------
@@ -467,127 +350,106 @@ Skip a varint-length-prefixed string. This means skipping a value with wire type
 :stream:        Input stream to read from.
 :returns:       True on success, false on IO error or length exceeding uint32_t.
 
-pb_decode
----------
-Read and decode all fields of a structure. Reads until EOF on input stream. ::
+pb_decode_tag
+-------------
+Decode the tag that comes before field in the protobuf encoding::
 
-    bool pb_decode(pb_istream_t *stream, const pb_message_t *msg, void *dest_struct);
+    bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, int *tag, bool *eof);
 
 :stream:        Input stream to read from.
-:msg:           A message descriptor. Usually autogenerated.
-:dest_struct:   Pointer to structure where data will be stored.
-:returns:       True on success, false on IO error, on detectable errors in field description, if a field encoder returns false or if a required field is missing.
+:wire_type:     Pointer to variable where to store the wire type of the field.
+:tag:           Pointer to variable where to store the tag of the field.
+:eof:           Pointer to variable where to store end-of-file status.
+:returns:       True on success, false on error or EOF.
 
-In Protocol Buffers binary format, EOF is only allowed between fields. If it happens anywhere else, pb_decode will return *false*. If pb_decode returns false, you cannot trust any of the data in the structure.
+When the message (stream) ends, this function will return false and set *eof* to true. On other
+errors, *eof* will be set to false.
 
-In addition to EOF, the pb_decode implementation supports terminating a message with a 0 byte. This is compatible with the official Protocol Buffers because 0 is never a valid field tag.
-
-For optional fields, this function applies the default value and clears the corresponding bit in *has_fields* if the field is not present.
-
-pb_clean
---------
-Release and clear all the unused pointers of a structure. ::
-
-    bool pb_clean(const pb_message_t *msg, void *dest_struct);
-
-:msg:           A message descriptor. Usually autogenerated.
-:dest_struct:   Pointer to structure to be cleaned.
-:returns:       True on success, false if one of the unused message fields has a pointer type that this function cannot handle.
-
-For each string or submessage with pointer type, this function calls *free()* on the pointer and sets the pointer to NULL.
-
-For bytes fields with pointer type, this function calls *free()* on the allocated data, nulls that pointer and zeros the size fields in the generated pb_bytes_t structure.
-
-For repeated fields, it applies the corresponding operation above to each unused element of the generated array.
-
-.. sidebar:: Field decoders
-    
-    The functions with names beginning with *pb_dec_* are called field decoders. Each PB_LTYPE has an own field decoder, which handles translating from Protocol Buffers data to C data.
-
-    Each field decoder reads and decodes a single value. For arrays, the decoder is called repeatedly.
-
-    You can use the decoders from your callbacks. Just be aware that the pb_field_t passed to the callback is not directly compatible with most of the field decoders. Instead, you must create a new pb_field_t structure and set the data_size according to the data type you pass to *dest*.
-
-pb_dec_varint
+pb_skip_field
 -------------
-Field decoder for PB_LTYPE_VARINT. ::
+Remove the data for a field from the stream, without actually decoding it::
 
-    bool pb_dec_varint(pb_istream_t *stream, const pb_field_t *field, void *dest)
+    bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
+
+:stream:        Input stream to read from.
+:wire_type:     Type of field to skip.
+:returns:       True on success, false on IO error.
+
+.. sidebar:: Decoding fields manually
+    
+    The functions with names beginning with *pb_decode_* are used when dealing with callback fields. The typical reason for using callbacks is to have an array of unlimited size. In that case, `pb_decode`_ will call your callback function repeatedly, which can then store the values into e.g. filesystem in the order received in.
+
+    For decoding numeric (including enumerated and boolean) values, use `pb_decode_varint`_, `pb_decode_svarint`_, `pb_decode_fixed32`_ and `pb_decode_fixed64`_. They take a pointer to a 32- or 64-bit C variable, which you may then cast to smaller datatype for storage.
+
+    For decoding strings and bytes fields, the length has already been decoded. You can therefore check the total length in *stream->bytes_left* and read the data using `pb_read`_.
+
+    Finally, for decoding submessages in a callback, simply use `pb_decode`_ and pass it the *SubMessage_fields* descriptor array.
+
+pb_decode_varint
+----------------
+Read and decode a varint_ encoded integer. ::
+
+    bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
 
 :stream:        Input stream to read from. 1-10 bytes will be read.
-:field:         Field description structure. Only *field->data_size* matters.
-:dest:          Pointer to destination integer. Must have size of *field->data_size* bytes.
-:returns:       True on success, false on IO errors or if `pb_decode_varint`_ fails.
+:dest:          Storage for the decoded integer. Value is undefined on error.
+:returns:       True on success, false if value exceeds uint64_t range or an IO error happens.
 
-This function first calls `pb_decode_varint`_. It then copies the first bytes of the 64-bit result value to *dest*, or on big endian architectures, the last bytes.
+pb_decode_svarint
+-----------------
+Similar to `pb_decode_varint`_, except that it performs zigzag-decoding on the value. This corresponds to the Protocol Buffers *sint32* and *sint64* datatypes. ::
 
-pb_dec_svarint
---------------
-Field decoder for PB_LTYPE_SVARINT. Similar to `pb_dec_varint`_, except that it performs zigzag-decoding on the value. ::
+    bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
 
-    bool pb_dec_svarint(pb_istream_t *stream, const pb_field_t *field, void *dest);
+(parameters are the same as `pb_decode_varint`_)
 
-(parameters are the same as `pb_dec_varint`_)
+pb_decode_fixed32
+-----------------
+Decode a *fixed32*, *sfixed32* or *float* value. ::
 
-pb_dec_fixed32
---------------
-Field decoder for PB_LTYPE_FIXED32. ::
+    bool pb_decode_fixed32(pb_istream_t *stream, void *dest);
 
-    bool pb_dec_fixed(pb_istream_t *stream, const pb_field_t *field, void *dest);
-
-:stream:        Input stream to read from. 1-10 bytes will be read.
-:field:         Not used.
-:dest:          Pointer to destination integer. Must have size of *field->data_size* bytes.
-:returns:       True on success, false on IO errors or if `pb_decode_varint`_ fails.
+:stream:        Input stream to read from. 4 bytes will be read.
+:dest:          Pointer to destination *int32_t*, *uint32_t* or *float*.
+:returns:       True on success, false on IO errors.
 
 This function reads 4 bytes from the input stream.
 On big endian architectures, it then reverses the order of the bytes.
 Finally, it writes the bytes to *dest*.
 
-pb_dec_fixed64
---------------
-Field decoder for PB_LTYPE_FIXED64. ::
+pb_decode_fixed64
+-----------------
+Decode a *fixed64*, *sfixed64* or *double* value. ::
 
     bool pb_dec_fixed(pb_istream_t *stream, const pb_field_t *field, void *dest);
 
-Same as `pb_dec_fixed32`_, except this reads 8 bytes.
+:stream:        Input stream to read from. 8 bytes will be read.
+:field:         Not used.
+:dest:          Pointer to destination *int64_t*, *uint64_t* or *double*.
+:returns:       True on success, false on IO errors.
 
-pb_dec_bytes
-------------
-Field decoder for PB_LTYPE_BYTES. Reads a length-prefixed block of bytes. ::
+Same as `pb_decode_fixed32`_, except this reads 8 bytes.
 
-    bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, void *dest);
+pb_make_string_substream
+------------------------
+Decode the length for a field with wire type *PB_WT_STRING* and create a substream for reading the data. ::
 
-:stream:        Input stream to read from.
-:field:         Field description structure. Only *field->data_size* matters.
-:dest:          Pointer to a structure similar to pb_bytes_array_t.
-:returns:       True on success, false on IO error or if length exceeds the array size.
+    bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
 
-This function expects a pointer to a structure with a *size_t* field at start, and a variable sized byte array after it. It will deduce the maximum size of the array from *field->data_size*.
+:stream:        Original input stream to read the length and data from.
+:substream:     New substream that has limited length. Filled in by the function.
+:returns:       True on success, false if reading the length fails.
 
-pb_dec_string
--------------
-Field decoder for PB_LTYPE_STRING. Reads a length-prefixed string. ::
+This function uses `pb_decode_varint`_ to read an integer from the stream. This is interpreted as a number of bytes, and the substream is set up so that its `bytes_left` is initially the same as the length, and its callback function and state the same as the parent stream.
 
-    bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, void *dest);
+pb_close_string_substream
+-------------------------
+Close the substream created with `pb_make_string_substream`_. ::
 
-:stream:        Input stream to read from.
-:field:         Field description structure. Only *field->data_size* matters.
-:dest:          Pointer to a character array of size *field->data_size*.
-:returns:       True on success, false on IO error or if length exceeds the array size.
+    void pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
 
-This function null-terminates the string when successful. On error, the contents of the destination array is undefined.
-
-pb_dec_submessage
------------------
-Field decoder for PB_LTYPE_SUBMESSAGE. Calls `pb_decode`_ to perform the actual decoding. ::
-
-    bool pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field, void *dest)
-
-:stream:        Input stream to read from.
-:field:         Field description structure. Only *field->ptr* matters.
-:dest:          Pointer to the destination structure.
-:returns:       True on success, false on IO error or if `pb_decode`_ fails.
-
-The *field->ptr* should be a pointer to *pb_message_t* describing the submessage.
+:stream:        Original input stream to read the length and data from.
+:substream:     Substream to close
 
+This function copies back the state from the substream to the parent stream.
+It must be called after done with the substream.

example/client.c

@@ -27,10 +27,10 @@ bool printfile_callback(pb_istream_t *stream, const pb_field_t *field, void *arg
 {
     FileInfo fileinfo;
     
-    if (!pb_decode(stream, FileInfo_msg, &fileinfo))
+    if (!pb_decode(stream, FileInfo_fields, &fileinfo))
         return false;
     
-    printf("%-10lld %s\n", fileinfo.inode, fileinfo.name);
+    printf("%-10lld %s\n", (long long)fileinfo.inode, fileinfo.name);
     
     return true;
 }
@@ -45,11 +45,11 @@ bool listdir(int fd, char *path)
     
     if (path == NULL)
     {
-        ListFilesRequest_clear(request, path);
+        request.has_path = false;
     }
     else
     {
-        ListFilesRequest_set(request, path);
+        request.has_path = true;
         if (strlen(path) + 1 > sizeof(request.path))
         {
             fprintf(stderr, "Too long path.\n");
@@ -59,7 +59,7 @@ bool listdir(int fd, char *path)
         strcpy(request.path, path);
     }
     
-    if (!pb_encode(&output, ListFilesRequest_msg, &request))
+    if (!pb_encode(&output, ListFilesRequest_fields, &request))
     {
         fprintf(stderr, "Encoding failed.\n");
         return false;
@@ -70,9 +70,9 @@ bool listdir(int fd, char *path)
     
     response.file.funcs.decode = &printfile_callback;
     
-    if (!pb_decode(&input, ListFilesResponse_msg, &response))
+    if (!pb_decode(&input, ListFilesResponse_fields, &response))
     {
-        fprintf(stderr, "Decoding failed.\n");
+        fprintf(stderr, "Decode failed: %s\n", PB_GET_ERROR(&input));
         return false;
     }
     

example/common.c

@@ -10,24 +10,15 @@
 
 static bool write_callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
 {
-    int fd = (int)stream->state;
+    int fd = (intptr_t)stream->state;
     return send(fd, buf, count, 0) == count;
 }
 
 static bool read_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
 {
-    int fd = (int)stream->state;
+    int fd = (intptr_t)stream->state;
     int result;
     
-    if (buf == NULL)
-    {
-        /* Well, this is a really inefficient way to skip input. */
-        /* It is only used when there are unknown fields. */
-        char dummy;
-        while (count-- && recv(fd, &dummy, 1, 0) == 1);
-        return count == 0;
-    }
-    
     result = recv(fd, buf, count, MSG_WAITALL);
     
     if (result == 0)
@@ -38,12 +29,12 @@ static bool read_callback(pb_istream_t *stream, uint8_t *buf, size_t count)
 
 pb_ostream_t pb_ostream_from_socket(int fd)
 {
-    pb_ostream_t stream = {&write_callback, (void*)fd, SIZE_MAX, 0};
+    pb_ostream_t stream = {&write_callback, (void*)(intptr_t)fd, SIZE_MAX, 0};
     return stream;
 }
 
 pb_istream_t pb_istream_from_socket(int fd)
 {
-    pb_istream_t stream = {&read_callback, (void*)fd, SIZE_MAX};
+    pb_istream_t stream = {&read_callback, (void*)(intptr_t)fd, SIZE_MAX};
     return stream;
 }

example/server.c

@@ -38,7 +38,7 @@ bool listdir_callback(pb_ostream_t *stream, const pb_field_t *field, const void
         if (!pb_encode_tag_for_field(stream, field))
             return false;
         
-        if (!pb_enc_submessage(stream, field, &fileinfo))
+        if (!pb_encode_submessage(stream, FileInfo_fields, &fileinfo))
             return false;
     }
     
@@ -53,9 +53,9 @@ void handle_connection(int connfd)
     pb_ostream_t output = pb_ostream_from_socket(connfd);
     DIR *directory;
     
-    if (!pb_decode(&input, ListFilesRequest_msg, &request))
+    if (!pb_decode(&input, ListFilesRequest_fields, &request))
     {
-        printf("Decoding failed.\n");
+        printf("Decode failed: %s\n", PB_GET_ERROR(&input));
         return;
     }
     
@@ -67,18 +67,18 @@ void handle_connection(int connfd)
     {
         perror("opendir");
         
-        ListFilesResponse_set(response, path_error);
+        response.has_path_error = true;
         response.path_error = true;
         response.file.funcs.encode = NULL;
     }
     else
     {
-        ListFilesResponse_clear(response, path_error);
+        response.has_path_error = false;
         response.file.funcs.encode = &listdir_callback;
         response.file.arg = directory;
     }
     
-    if (!pb_encode(&output, ListFilesResponse_msg, &response))
+    if (!pb_encode(&output, ListFilesResponse_fields, &response))
     {
         printf("Encoding failed.\n");
     }

example_unions/Makefile

@@ -0,0 +1,17 @@
+CFLAGS=-ansi -Wall -Werror -I .. -g -O0
+DEPS=../pb_decode.c ../pb_decode.h ../pb_encode.c ../pb_encode.h ../pb.h
+
+all: encode decode
+	./encode 1 | ./decode
+	./encode 2 | ./decode
+	./encode 3 | ./decode
+
+clean:
+	rm -f encode unionproto.pb.h unionproto.pb.c
+
+%: %.c $(DEPS) unionproto.pb.h unionproto.pb.c
+	$(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c unionproto.pb.c
+
+unionproto.pb.h unionproto.pb.c: unionproto.proto ../generator/nanopb_generator.py
+	protoc -I. -I../generator -I/usr/include -ounionproto.pb $<
+	python ../generator/nanopb_generator.py unionproto.pb

example_unions/decode.c

@@ -0,0 +1,96 @@
+/* This program reads a message from stdin, detects its type and decodes it.
+ */
+ 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <pb_decode.h>
+#include "unionproto.pb.h"
+
+/* This function reads manually the first tag from the stream and finds the
+ * corresponding message type. It doesn't yet decode the actual message.
+ *
+ * Returns a pointer to the MsgType_fields array, as an identifier for the
+ * message type. Returns null if the tag is of unknown type or an error occurs.
+ */
+const pb_field_t* decode_unionmessage_type(pb_istream_t *stream)
+{
+    pb_wire_type_t wire_type;
+    uint32_t tag;
+    bool eof;
+
+    while (pb_decode_tag(stream, &wire_type, &tag, &eof))
+    {
+        if (wire_type == PB_WT_STRING)
+        {
+            const pb_field_t *field;
+            for (field = UnionMessage_fields; field->tag != 0; field++)
+            {
+                if (field->tag == tag && (field->type & PB_LTYPE_SUBMESSAGE))
+                {
+                    /* Found our field. */
+                    return field->ptr;
+                }
+            }
+        }
+        
+        /* Wasn't our field.. */
+        pb_skip_field(stream, wire_type);
+    }
+    
+    return NULL;
+}
+
+bool decode_unionmessage_contents(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
+{
+    pb_istream_t substream;
+    bool status;
+    if (!pb_make_string_substream(stream, &substream))
+        return false;
+    
+    status = pb_decode(&substream, fields, dest_struct);
+    pb_close_string_substream(stream, &substream);
+    return status;
+}
+
+int main()
+{
+    /* Read the data into buffer */
+    uint8_t buffer[512];
+    size_t count = fread(buffer, 1, sizeof(buffer), stdin);
+    pb_istream_t stream = pb_istream_from_buffer(buffer, count);
+    
+    const pb_field_t *type = decode_unionmessage_type(&stream);
+    bool status = false;
+    
+    if (type == MsgType1_fields)
+    {
+        MsgType1 msg = {};
+        status = decode_unionmessage_contents(&stream, MsgType1_fields, &msg);
+        printf("Got MsgType1: %d\n", msg.value);
+    }
+    else if (type == MsgType2_fields)
+    {
+        MsgType2 msg = {};
+        status = decode_unionmessage_contents(&stream, MsgType2_fields, &msg);
+        printf("Got MsgType2: %s\n", msg.value ? "true" : "false");
+    }
+    else if (type == MsgType3_fields)
+    {
+        MsgType3 msg = {};
+        status = decode_unionmessage_contents(&stream, MsgType3_fields, &msg);
+        printf("Got MsgType3: %d %d\n", msg.value1, msg.value2);    
+    }
+    
+    if (!status)
+    {
+        printf("Decode failed: %s\n", PB_GET_ERROR(&stream));
+        return 1;
+    }
+    
+    return 0;
+}
+
+
+

example_unions/encode.c

@@ -0,0 +1,85 @@
+/* This program takes a command line argument and encodes a message in
+ * one of MsgType1, MsgType2 or MsgType3.
+ */
+ 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <pb_encode.h>
+#include "unionproto.pb.h"
+
+/* This function is the core of the union encoding process. It handles
+ * the top-level pb_field_t array manually, in order to encode a correct
+ * field tag before the message. The pointer to MsgType_fields array is
+ * used as an unique identifier for the message type.
+ */
+bool encode_unionmessage(pb_ostream_t *stream, const pb_field_t messagetype[], const void *message)
+{
+    const pb_field_t *field;
+    for (field = UnionMessage_fields; field->tag != 0; field++)
+    {
+        if (field->ptr == messagetype)
+        {
+            /* This is our field, encode the message using it. */
+            if (!pb_encode_tag_for_field(stream, field))
+                return false;
+            
+            return pb_encode_submessage(stream, messagetype, message);
+        }
+    }
+    
+    /* Didn't find the field for messagetype */
+    return false;
+}
+
+int main(int argc, char **argv)
+{
+    if (argc != 2)
+    {
+        fprintf(stderr, "Usage: %s (1|2|3)\n", argv[0]);
+        return 1;
+    }
+    
+    uint8_t buffer[512];
+    pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+    
+    bool status = false;
+    int msgtype = atoi(argv[1]);
+    if (msgtype == 1)
+    {
+        /* Send message of type 1 */
+        MsgType1 msg = {42};
+        status = encode_unionmessage(&stream, MsgType1_fields, &msg);
+    }
+    else if (msgtype == 2)
+    {
+        /* Send message of type 2 */
+        MsgType2 msg = {true};
+        status = encode_unionmessage(&stream, MsgType2_fields, &msg);
+    }
+    else if (msgtype == 3)
+    {
+        /* Send message of type 3 */
+        MsgType3 msg = {3, 1415};
+        status = encode_unionmessage(&stream, MsgType3_fields, &msg);
+    }
+    else
+    {
+        fprintf(stderr, "Unknown message type: %d\n", msgtype);
+        return 2;
+    }
+    
+    if (!status)
+    {
+        fprintf(stderr, "Encoding failed!\n");
+        return 3;
+    }
+    else
+    {
+        fwrite(buffer, 1, stream.bytes_written, stdout);
+        return 0; /* Success */
+    }
+}
+
+

example_unions/unionproto.proto

@@ -0,0 +1,30 @@
+// This is an example of how to handle 'union' style messages
+// with nanopb, without allocating memory for all the message types.
+//
+// There is no official type in Protocol Buffers for describing unions,
+// but they are commonly implemented by filling out exactly one of
+// several optional fields.
+
+message MsgType1
+{
+    required int32 value = 1;
+}
+
+message MsgType2
+{
+    required bool value = 1;
+}
+
+message MsgType3
+{
+    required int32 value1 = 1;
+    required int32 value2 = 2;
+}
+
+message UnionMessage
+{
+    optional MsgType1 msg1 = 1;
+    optional MsgType2 msg2 = 2;
+    optional MsgType3 msg3 = 3;
+}
+

generator/nanopb.proto

@@ -1,17 +1,30 @@
 // Custom options for defining:
 // - Maximum size of string/bytes
 // - Maximum number of elements in array
-// - Pointer or in-line representation of non-scalar fields
 //
 // These are used by nanopb to generate statically allocable structures
 // for memory-limited environments.
 
 import "google/protobuf/descriptor.proto";
 
+enum FieldType {
+    FT_DEFAULT = 0; // Automatically decide field type, generate static field if possible.
+    FT_CALLBACK = 1; // Always generate a callback field.
+    FT_STATIC = 2; // Generate a static field or raise an exception if not possible.
+}
+
 message NanoPBOptions {
+  // Allocated size for 'bytes' and 'string' fields.
   optional int32 max_size = 1;
+  
+  // Allocated number of entries in arrays ('repeated' fields)
   optional int32 max_count = 2;
-  optional bool pointer = 3;
+  
+  // Force type of field (callback or static allocation)
+  optional FieldType type = 3 [default = FT_DEFAULT];
+  
+  // Use long names for enums, i.e. EnumName_EnumValue.
+  optional bool long_names = 4 [default = true];
 }
 
 // Protocol Buffers extension number registry
@@ -22,7 +35,20 @@ message NanoPBOptions {
 // Extensions: 1010 (all types)                                                                                                                
 // --------------------------------   
 
+extend google.protobuf.FileOptions {
+    optional NanoPBOptions nanopb_fileopt = 1010;
+}
+
+extend google.protobuf.MessageOptions {
+    optional NanoPBOptions nanopb_msgopt = 1010;
+}
+
+extend google.protobuf.EnumOptions {
+    optional NanoPBOptions nanopb_enumopt = 1010;
+}
+
 extend google.protobuf.FieldOptions {
     optional NanoPBOptions nanopb = 1010;
 }
 
+

generator/nanopb_generator.py

@@ -1,9 +1,39 @@
 '''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''
+nanopb_version = "nanopb-0.1.8"
 
-import google.protobuf.descriptor_pb2 as descriptor
-import nanopb_pb2
+try:
+    import google.protobuf.descriptor_pb2 as descriptor
+except:
+    print
+    print "*************************************************************"
+    print "*** Could not import the Google protobuf Python libraries ***"
+    print "*** Try installing package 'python-protobuf' or similar.  ***"
+    print "*************************************************************"
+    print
+    raise
+
+try:
+    import nanopb_pb2
+except:
+    print
+    print "***************************************************************"
+    print "*** Could not import the precompiled nanopb_pb2.py.         ***"
+    print "*** Run 'make' in the 'generator' folder to update the file.***"
+    print "***************************************************************"
+    print
+    raise
+
+
+
+
+
+
+# ---------------------------------------------------------------------------
+#                     Generation of single fields
+# ---------------------------------------------------------------------------
+
+import time
 import os.path
-from optparse import OptionParser
 
 # Values are tuple (c type, pb ltype)
 FieldD = descriptor.FieldDescriptorProto
@@ -15,19 +45,13 @@ datatypes = {
     FieldD.TYPE_FLOAT: ('float', 'PB_LTYPE_FIXED32'),
     FieldD.TYPE_INT32: ('int32_t', 'PB_LTYPE_VARINT'),
     FieldD.TYPE_INT64: ('int64_t', 'PB_LTYPE_VARINT'),
-    FieldD.TYPE_SFIXED32: ('int32_t', 'PB_LTYPE_FIXED'),
-    FieldD.TYPE_SFIXED64: ('int64_t', 'PB_LTYPE_FIXED'),
+    FieldD.TYPE_SFIXED32: ('int32_t', 'PB_LTYPE_FIXED32'),
+    FieldD.TYPE_SFIXED64: ('int64_t', 'PB_LTYPE_FIXED64'),
     FieldD.TYPE_SINT32: ('int32_t', 'PB_LTYPE_SVARINT'),
     FieldD.TYPE_SINT64: ('int64_t', 'PB_LTYPE_SVARINT'),
     FieldD.TYPE_UINT32: ('uint32_t', 'PB_LTYPE_VARINT'),
     FieldD.TYPE_UINT64: ('uint64_t', 'PB_LTYPE_VARINT')
 }
-pointable_types = frozenset([
-    FieldD.TYPE_STRING,
-    FieldD.TYPE_BYTES,
-    FieldD.TYPE_MESSAGE
-])
-options = None
 
 class Names:
     '''Keeps a set of nested names and formats them to C identifier.
@@ -49,6 +73,9 @@ class Names:
         else:
             raise ValueError("Name parts should be of type str")
     
+    def __eq__(self, other):
+        return isinstance(other, Names) and self.parts == other.parts
+    
 def names_from_type_name(type_name):
     '''Parse Names() from FieldDescriptorProto type_name'''
     if type_name[0] != '.':
@@ -56,19 +83,27 @@ def names_from_type_name(type_name):
     return Names(type_name[1:].split('.'))
 
 class Enum:
-    def __init__(self, names, desc):
+    def __init__(self, names, desc, enum_options):
         '''desc is EnumDescriptorProto'''
+        
+        self.options = enum_options
         self.names = names + desc.name
-        self.values = [(self.names + x.name, x.number) for x in desc.value]
+        
+        if enum_options.long_names:
+            self.values = [(self.names + x.name, x.number) for x in desc.value]            
+        else:
+            self.values = [(names + x.name, x.number) for x in desc.value] 
+        
+        self.value_longnames = [self.names + x.name for x in desc.value]
     
     def __str__(self):
-        result = 'typedef enum {\n'
+        result = 'typedef enum _%s {\n' % self.names
         result += ',\n'.join(["    %s = %d" % x for x in self.values])
         result += '\n} %s;' % self.names
         return result
 
 class Field:
-    def __init__(self, struct_name, desc):
+    def __init__(self, struct_name, desc, field_options):
         '''desc is FieldDescriptorProto'''
         self.tag = desc.number
         self.struct_name = struct_name
@@ -77,44 +112,33 @@ class Field:
         self.max_size = None
         self.max_count = None
         self.array_decl = ""
-        self.is_pointer = options.pointer
-        self.is_array = False
         
-        # Parse nanopb-specific field options
-        if desc.options.HasExtension(nanopb_pb2.nanopb):
-            ext = desc.options.Extensions[nanopb_pb2.nanopb]
-            if ext.HasField("max_size"):
-                self.max_size = ext.max_size
-            if ext.HasField("max_count"):
-                self.max_count = ext.max_count
-            if ext.HasField("pointer"):
-                self.is_pointer = ext.pointer
-                if desc.type not in pointable_types:
-                    raise NotImplementedError('Cannot make %s.%s a pointer'
-                                              % (struct_name, desc.name))
+        # Parse field options
+        if field_options.HasField("max_size"):
+            self.max_size = field_options.max_size
+        
+        if field_options.HasField("max_count"):
+            self.max_count = field_options.max_count
         
         if desc.HasField('default_value'):
             self.default = desc.default_value
-        
+           
         # Decide HTYPE
         # HTYPE is the high-order nibble of nanopb field description,
         # defining whether value is required/optional/repeated.
-        is_callback = False
+        can_be_static = True
         if desc.label == FieldD.LABEL_REQUIRED:
             self.htype = 'PB_HTYPE_REQUIRED'
         elif desc.label == FieldD.LABEL_OPTIONAL:
             self.htype = 'PB_HTYPE_OPTIONAL'
         elif desc.label == FieldD.LABEL_REPEATED:
             if self.max_count is None:
-                is_callback = True
+                can_be_static = False
             else:
                 self.htype = 'PB_HTYPE_ARRAY'
                 self.array_decl = '[%d]' % self.max_count
-                self.is_array = True
         else:
             raise NotImplementedError(desc.label)
-        if self.is_pointer:
-            self.htype += ' | PB_HTYPE_POINTER'
         
         # Decide LTYPE and CTYPE
         # LTYPE is the low-order nibble of nanopb field description,
@@ -129,19 +153,15 @@ class Field:
                 self.default = self.ctype + self.default
         elif desc.type == FieldD.TYPE_STRING:
             self.ltype = 'PB_LTYPE_STRING'
-            if self.is_pointer:
-                self.ctype = 'char'
-            elif self.max_size is None:
-                is_callback = True
+            if self.max_size is None:
+                can_be_static = False
             else:
                 self.ctype = 'char'
                 self.array_decl += '[%d]' % self.max_size
         elif desc.type == FieldD.TYPE_BYTES:
             self.ltype = 'PB_LTYPE_BYTES'
-            if self.is_pointer:
-                self.ctype = 'pb_bytes_t'
-            elif self.max_size is None:
-                is_callback = True
+            if self.max_size is None:
+                can_be_static = False
             else:
                 self.ctype = self.struct_name + self.name + 't'
         elif desc.type == FieldD.TYPE_MESSAGE:
@@ -150,7 +170,16 @@ class Field:
         else:
             raise NotImplementedError(desc.type)
         
-        if is_callback:
+        if field_options.type == nanopb_pb2.FT_DEFAULT:
+            if can_be_static:
+                field_options.type = nanopb_pb2.FT_STATIC
+            else:
+                field_options.type = nanopb_pb2.FT_CALLBACK
+        
+        if field_options.type == nanopb_pb2.FT_STATIC and not can_be_static:
+            raise Exception("Field %s is defined as static, but max_size or max_count is not given." % self.name)
+        
+        if field_options.type == nanopb_pb2.FT_CALLBACK:
             self.htype = 'PB_HTYPE_CALLBACK'
             self.ctype = 'pb_callback_t'
             self.array_decl = ''
@@ -159,14 +188,13 @@ class Field:
         return cmp(self.tag, other.tag)
     
     def __str__(self):
-        if self.is_array:
+        if self.htype == 'PB_HTYPE_OPTIONAL':
+            result = '    bool has_' + self.name + ';\n'
+        elif self.htype == 'PB_HTYPE_ARRAY':
             result = '    size_t ' + self.name + '_count;\n'
         else:
             result = ''
-        if self.is_pointer and self.ctype != 'pb_bytes_t':
-            result += '    %s *%s%s;' % (self.ctype, self.name, self.array_decl)
-        else:
-            result += '    %s %s%s;' % (self.ctype, self.name, self.array_decl)
+        result += '    %s %s%s;' % (self.ctype, self.name, self.array_decl)
         return result
     
     def types(self):
@@ -219,58 +247,77 @@ class Field:
         prev_field_name is the name of the previous field or None.
         '''
         result = '    {%d, ' % self.tag
-        result += self.htype
+        result += '(pb_type_t) ((int) ' + self.htype
         if self.ltype is not None:
-            result += ' | ' + self.ltype
-        result += ',\n'
+            result += ' | (int) ' + self.ltype
+        result += '),\n'
         
         if prev_field_name is None:
             result += '    offsetof(%s, %s),' % (self.struct_name, self.name)
         else:
             result += '    pb_delta_end(%s, %s, %s),' % (self.struct_name, self.name, prev_field_name)
         
-        if self.is_array:
+        if self.htype == 'PB_HTYPE_OPTIONAL':
+            result += '\n    pb_delta(%s, has_%s, %s),' % (self.struct_name, self.name, self.name)
+        elif self.htype == 'PB_HTYPE_ARRAY':
             result += '\n    pb_delta(%s, %s_count, %s),' % (self.struct_name, self.name, self.name)
         else:
             result += ' 0,'
         
-        if self.is_array:
+        
+        if self.htype == 'PB_HTYPE_ARRAY':
             result += '\n    pb_membersize(%s, %s[0]),' % (self.struct_name, self.name)
             result += ('\n    pb_membersize(%s, %s) / pb_membersize(%s, %s[0]),'
                        % (self.struct_name, self.name, self.struct_name, self.name))
-        elif self.htype != 'PB_HTYPE_CALLBACK' and not self.is_pointer and self.ltype == 'PB_LTYPE_BYTES':
-            result += '\n    pb_membersize(%s, bytes),' % self.ctype
-            result += ' 0,'
         else:
             result += '\n    pb_membersize(%s, %s),' % (self.struct_name, self.name)
             result += ' 0,'
         
         if self.ltype == 'PB_LTYPE_SUBMESSAGE':
-            result += '\n    %s_msg}' % self.submsgname
+            result += '\n    &%s_fields}' % self.submsgname
         elif self.default is None or self.htype == 'PB_HTYPE_CALLBACK':
             result += ' 0}'
         else:
             result += '\n    &%s_default}' % (self.struct_name + self.name)
         
         return result
+    
+    def largest_field_value(self):
+        '''Determine if this field needs 16bit or 32bit pb_field_t structure to compile properly.
+        Returns numeric value or a C-expression for assert.'''
+        if self.ltype == 'PB_LTYPE_SUBMESSAGE':
+            if self.htype == 'PB_HTYPE_ARRAY':
+                return 'pb_membersize(%s, %s[0])' % (self.struct_name, self.name)
+            else:
+                return 'pb_membersize(%s, %s)' % (self.struct_name, self.name)
+
+        return max(self.tag, self.max_size, self.max_count)        
+
+
+
+
+
+
+# ---------------------------------------------------------------------------
+#                   Generation of messages (structures)
+# ---------------------------------------------------------------------------
+
 
 class Message:
-    def __init__(self, names, desc):
+    def __init__(self, names, desc, message_options):
         self.name = names
-        self.fields = [Field(self.name, f) for f in desc.field]
+        self.fields = [Field(self.name, f, get_nanopb_suboptions(f, message_options)) for f in desc.field]
         self.ordered_fields = self.fields[:]
         self.ordered_fields.sort()
 
     def get_dependencies(self):
         '''Get list of type names that this structure refers to.'''
-        return [str(field.ctype) for field in self.fields if not
-                (field.is_pointer or field.htype == 'PB_HTYPE_CALLBACK')]
+        return [str(field.ctype) for field in self.fields]
     
     def __str__(self):
-        result = 'struct %s {\n' % self.name
-        result += '    uint8_t has_fields[%d];\n' % ((len(self.fields) + 7) / 8)
+        result = 'typedef struct _%s {\n' % self.name
         result += '\n'.join([str(f) for f in self.ordered_fields])
-        result += '\n};'
+        result += '\n} %s;' % self.name
         return result
     
     def types(self):
@@ -281,9 +328,6 @@ class Message:
                 result += types + '\n'
         return result
     
-    def typedef(self):
-        return 'typedef struct %s %s;' % (self.name, self.name)
-
     def default_decl(self, declaration_only = False):
         result = ""
         for field in self.fields:
@@ -292,37 +336,31 @@ class Message:
                 result += default + '\n'
         return result
 
-    def message_declaration(self):
-        result = 'typedef PB_MSG_STRUCT(%d) %s_msg_t;\n' % (len(self.fields), self.name)
-        result += 'extern const %s_msg_t %s_real_msg;\n' % (self.name, self.name)
-        result += '#define %s_msg ((const pb_message_t*)&%s_real_msg)\n' % (self.name, self.name)
+    def fields_declaration(self):
+        result = 'extern const pb_field_t %s_fields[%d];' % (self.name, len(self.fields) + 1)
         return result
 
-    def message_definition(self):
-        result = 'const %s_msg_t %s_real_msg = {\n' % (self.name, self.name)
-        result += '    %d, sizeof(%s),\n' % (len(self.fields), self.name)
+    def fields_definition(self):
+        result = 'const pb_field_t %s_fields[%d] = {\n' % (self.name, len(self.fields) + 1)
         
-        result += '    {\n\n'
         prev = None
         for field in self.ordered_fields:
             result += field.pb_field_t(prev)
             result += ',\n\n'
             prev = field.name
         
-        result += '    }\n};'
+        result += '    PB_LAST_FIELD\n};'
         return result
 
-    def field_numbers(self):
-        result = '#define %s_has(STRUCT, FIELD) PB_HAS_FIELD(STRUCT, %s, FIELD)\n' % (self.name, self.name)
-        result += '#define %s_set(STRUCT, FIELD) PB_SET_FIELD(STRUCT, %s, FIELD)\n' % (self.name, self.name)
-        result += '#define %s_clear(STRUCT, FIELD) PB_CLEAR_FIELD(STRUCT, %s, FIELD)\n' % (self.name, self.name)
 
-        i = 0
-        for field in self.ordered_fields:
-            result += '#define %s_%s_index %d\n' % (self.name, field.name, i)
-            result += '#define %s_%s_tag %d\n' % (self.name, field.name, field.tag)
-            i += 1
-        return result
+
+
+
+
+# ---------------------------------------------------------------------------
+#                    Processing of entire .proto files
+# ---------------------------------------------------------------------------
+
 
 def iterate_messages(desc, names = Names()):
     '''Recursively find all messages. For each, yield name, DescriptorProto.'''
@@ -338,7 +376,7 @@ def iterate_messages(desc, names = Names()):
         for x in iterate_messages(submsg, sub_names):
             yield x
 
-def parse_file(fdesc):
+def parse_file(fdesc, file_options):
     '''Takes a FileDescriptorProto and returns tuple (enum, messages).'''
     
     enums = []
@@ -350,12 +388,24 @@ def parse_file(fdesc):
         base_name = Names()
     
     for enum in fdesc.enum_type:
-        enums.append(Enum(base_name, enum))
+        enum_options = get_nanopb_suboptions(enum, file_options)
+        enums.append(Enum(base_name, enum, enum_options))
     
     for names, message in iterate_messages(fdesc, base_name):
-        messages.append(Message(names, message))
+        message_options = get_nanopb_suboptions(message, file_options)
+        messages.append(Message(names, message, message_options))
         for enum in message.enum_type:
-            enums.append(Enum(names, enum))
+            enum_options = get_nanopb_suboptions(enum, message_options)
+            enums.append(Enum(names, enum, enum_options))
+    
+    # Fix field default values where enum short names are used.
+    for enum in enums:
+        if not enum.options.long_names:
+            for message in messages:
+                for field in message.fields:
+                    if field.default in enum.value_longnames:
+                        idx = enum.value_longnames.index(field.default)
+                        field.default = enum.values[idx][0]
     
     return enums, messages
 
@@ -366,7 +416,7 @@ def toposort2(data):
     '''
     for k, v in data.items():
         v.discard(k) # Ignore self dependencies
-    extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys())
+    extra_items_in_deps = reduce(set.union, data.values(), set()) - set(data.keys())
     data.update(dict([(item, set()) for item in extra_items_in_deps]))
     while True:
         ordered = set(item for item,dep in data.items() if not dep)
@@ -390,27 +440,31 @@ def sort_dependencies(messages):
         if msgname in message_by_name:
             yield message_by_name[msgname]
 
-def generate_header(headername, enums, messages):
+def generate_header(dependencies, headername, enums, messages):
     '''Generate content for a header file.
     Generates strings, which should be concatenated and stored to file.
     '''
     
     yield '/* Automatically generated nanopb header */\n'
+    yield '/* Generated by %s at %s. */\n\n' % (nanopb_version, time.asctime())
     
     symbol = headername.replace('.', '_').upper()
     yield '#ifndef _PB_%s_\n' % symbol
     yield '#define _PB_%s_\n' % symbol
     yield '#include <pb.h>\n\n'
     
+    for dependency in dependencies:
+        noext = os.path.splitext(dependency)[0]
+        yield '#include "%s.pb.h"\n' % noext
+    
+    yield '#ifdef __cplusplus\n'
+    yield 'extern "C" {\n'
+    yield '#endif\n\n'
+    
     yield '/* Enum definitions */\n'
     for enum in enums:
         yield str(enum) + '\n\n'
     
-    yield '/* Struct typedefs */\n'
-    for msg in messages:
-        yield msg.typedef() + '\n'
-    yield '\n'
-    
     yield '/* Struct definitions */\n'
     for msg in sort_dependencies(messages):
         yield msg.types()
@@ -423,19 +477,68 @@ def generate_header(headername, enums, messages):
     
     yield '/* Struct field encoding specification for nanopb */\n'
     for msg in messages:
-        yield msg.message_declaration() + '\n'
-    yield '\n'
+        yield msg.fields_declaration() + '\n'
     
-    yield '/* Field indexes and tags */\n'
+    if messages:
+        count_required_fields = lambda m: len([f for f in msg.fields if f.htype == 'PB_HTYPE_REQUIRED'])
+        largest_msg = max(messages, key = count_required_fields)
+        largest_count = count_required_fields(largest_msg)
+        if largest_count > 64:
+            yield '\n/* Check that missing required fields will be properly detected */\n'
+            yield '#if PB_MAX_REQUIRED_FIELDS < %d\n' % largest_count
+            yield '#error Properly detecting missing required fields in %s requires \\\n' % largest_msg.name
+            yield '       setting PB_MAX_REQUIRED_FIELDS to %d or more.\n' % largest_count
+            yield '#endif\n'
+    
+    worst = 0
+    worst_field = ''
+    checks = []
+    checks_msgnames = []
     for msg in messages:
-        yield msg.field_numbers()
+        checks_msgnames.append(msg.name)
+        for field in msg.fields:
+            status = field.largest_field_value()
+            if isinstance(status, (str, unicode)):
+                checks.append(status)
+            elif status > worst:
+                worst = status
+                worst_field = str(field.struct_name) + '.' + str(field.name)
 
+    if worst > 255 or checks:
+        yield '\n/* Check that field information fits in pb_field_t */\n'
+        
+        if worst < 65536:
+            yield '#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)\n'
+            if worst > 255:
+                yield '#error Field descriptor for %s is too large. Define PB_FIELD_16BIT to fix this.\n' % worst_field
+            else:
+                assertion = ' && '.join(str(c) + ' < 256' for c in checks)
+                msgs = '_'.join(str(n) for n in checks_msgnames)
+                yield 'STATIC_ASSERT((%s), YOU_MUST_DEFINE_PB_FIELD_16BIT_FOR_MESSAGES_%s)\n'%(assertion,msgs)
+            yield '#endif\n\n'
+        
+        if worst > 65535 or checks:
+            yield '#if !defined(PB_FIELD_32BIT)\n'
+            if worst > 65535:
+                yield '#error Field descriptor for %s is too large. Define PB_FIELD_32BIT to fix this.\n' % worst_field
+            else:
+                assertion = ' && '.join(str(c) + ' < 65536' for c in checks)
+                msgs = '_'.join(str(n) for n in checks_msgnames)
+                yield 'STATIC_ASSERT((%s), YOU_MUST_DEFINE_PB_FIELD_32BIT_FOR_MESSAGES_%s)\n'%(assertion,msgs)
+            yield '#endif\n'
+    
+    yield '\n#ifdef __cplusplus\n'
+    yield '} /* extern "C" */\n'
+    yield '#endif\n'
+    
+    # End of header
     yield '\n#endif\n'
 
 def generate_source(headername, enums, messages):
     '''Generate content for a source file.'''
     
     yield '/* Automatically generated nanopb constant definitions */\n'
+    yield '/* Generated by %s at %s. */\n\n' % (nanopb_version, time.asctime())
     yield '#include "%s"\n\n' % headername
     
     for msg in messages:
@@ -444,43 +547,107 @@ def generate_source(headername, enums, messages):
     yield '\n\n'
     
     for msg in messages:
-        yield msg.message_definition() + '\n\n'
+        yield msg.fields_definition() + '\n\n'
+
+
+
+# ---------------------------------------------------------------------------
+#                         Command line interface
+# ---------------------------------------------------------------------------
+
+import sys
+import os.path    
+from optparse import OptionParser
+import google.protobuf.text_format as text_format
+
+optparser = OptionParser(
+    usage = "Usage: nanopb_generator.py [options] file.pb ...",
+    epilog = "Compile file.pb from file.proto by: 'protoc -ofile.pb file.proto'. " +
+             "Output will be written to file.pb.h and file.pb.c.")
+optparser.add_option("-x", dest="exclude", metavar="FILE", action="append", default=[],
+    help="Exclude file from generated #include list.")
+optparser.add_option("-q", "--quiet", dest="quiet", action="store_true", default=False,
+    help="Don't print anything except errors.")
+optparser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False,
+    help="Print more information.")
+optparser.add_option("-s", dest="settings", metavar="OPTION:VALUE", action="append", default=[],
+    help="Set generator option (max_size, max_count etc.).")
+
+def get_nanopb_suboptions(subdesc, options):
+    '''Get copy of options, and merge information from subdesc.'''
+    new_options = nanopb_pb2.NanoPBOptions()
+    new_options.CopyFrom(options)
+    
+    if isinstance(subdesc.options, descriptor.FieldOptions):
+        ext_type = nanopb_pb2.nanopb
+    elif isinstance(subdesc.options, descriptor.FileOptions):
+        ext_type = nanopb_pb2.nanopb_fileopt
+    elif isinstance(subdesc.options, descriptor.MessageOptions):
+        ext_type = nanopb_pb2.nanopb_msgopt
+    elif isinstance(subdesc.options, descriptor.EnumOptions):
+        ext_type = nanopb_pb2.nanopb_enumopt
+    else:
+        raise Exception("Unknown options type")
+    
+    if subdesc.options.HasExtension(ext_type):
+        ext = subdesc.options.Extensions[ext_type]
+        new_options.MergeFrom(ext)
+    
+    return new_options
+
+def process(filenames, options):
+    '''Process the files given on the command line.'''
+    
+    if not filenames:
+        optparser.print_help()
+        return False
+    
+    if options.quiet:
+        options.verbose = False
+    
+    toplevel_options = nanopb_pb2.NanoPBOptions()
+    for s in options.settings:
+        text_format.Merge(s, toplevel_options)
+    
+    for filename in filenames:
+        data = open(filename, 'rb').read()
+        fdesc = descriptor.FileDescriptorSet.FromString(data)
+        
+        file_options = get_nanopb_suboptions(fdesc.file[0], toplevel_options)
+        
+        if options.verbose:
+            print "Options for " + filename + ":"
+            print text_format.MessageToString(file_options)
+        
+        enums, messages = parse_file(fdesc.file[0], file_options)
+        
+        noext = os.path.splitext(filename)[0]
+        headername = noext + '.pb.h'
+        sourcename = noext + '.pb.c'
+        headerbasename = os.path.basename(headername)
+        
+        if not options.quiet:
+            print "Writing to " + headername + " and " + sourcename
+        
+        # List of .proto files that should not be included in the C header file
+        # even if they are mentioned in the source .proto.
+        excludes = ['nanopb.proto', 'google/protobuf/descriptor.proto'] + options.exclude
+        dependencies = [d for d in fdesc.file[0].dependency if d not in excludes]
+        
+        header = open(headername, 'w')
+        for part in generate_header(dependencies, headerbasename, enums, messages):
+            header.write(part)
+
+        source = open(sourcename, 'w')
+        for part in generate_source(headerbasename, enums, messages):
+            source.write(part)
+
+    return True
 
 if __name__ == '__main__':
-    import sys
-    import os.path
+    options, filenames = optparser.parse_args()
+    status = process(filenames, options)
     
-    parser = OptionParser(usage="Usage: %prog [options] file.pb",
-                          epilog=
-"""file.pb should be compiled from file.proto by:
-protoc -ofile.pb file.proto
-""")
-    parser.add_option("-p", "--pointer", dest="pointer",
-                      action="store_true", default=False,
-                      help="generate pointers for non-scalar fields")
-
-    (options, args) = parser.parse_args()
-
-    if len(args) != 1:
-        parser.error("Please provide exactly one file.pb argument")
-
-    data = open(args[0]).read()
-    fdesc = descriptor.FileDescriptorSet.FromString(data)
-    enums, messages = parse_file(fdesc.file[0])
-    
-    noext = os.path.splitext(args[0])[0]
-    headername = noext + '.pb.h'
-    sourcename = noext + '.pb.c'
-    headerbasename = os.path.basename(headername)
-    
-    print "Writing to " + headername + " and " + sourcename
-    
-    header = open(headername, 'w')
-    for part in generate_header(headerbasename, enums, messages):
-        header.write(part)
-
-    source = open(sourcename, 'w')
-    for part in generate_source(headerbasename, enums, messages):
-        source.write(part)
-
+    if not status:
+        sys.exit(1)
     

generator/nanopb_pb2.py

@@ -12,12 +12,65 @@ import google.protobuf.descriptor_pb2
 DESCRIPTOR = descriptor.FileDescriptor(
   name='nanopb.proto',
   package='',
-  serialized_pb='\n\x0cnanopb.proto\x1a google/protobuf/descriptor.proto\"E\n\rNanoPBOptions\x12\x10\n\x08max_size\x18\x01 \x01(\x05\x12\x11\n\tmax_count\x18\x02 \x01(\x05\x12\x0f\n\x07pointer\x18\x03 \x01(\x08:>\n\x06nanopb\x12\x1d.google.protobuf.FieldOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions')
+  serialized_pb='\n\x0cnanopb.proto\x1a google/protobuf/descriptor.proto\"t\n\rNanoPBOptions\x12\x10\n\x08max_size\x18\x01 \x01(\x05\x12\x11\n\tmax_count\x18\x02 \x01(\x05\x12$\n\x04type\x18\x03 \x01(\x0e\x32\n.FieldType:\nFT_DEFAULT\x12\x18\n\nlong_names\x18\x04 \x01(\x08:\x04true*;\n\tFieldType\x12\x0e\n\nFT_DEFAULT\x10\x00\x12\x0f\n\x0b\x46T_CALLBACK\x10\x01\x12\r\n\tFT_STATIC\x10\x02:E\n\x0enanopb_fileopt\x12\x1c.google.protobuf.FileOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:G\n\rnanopb_msgopt\x12\x1f.google.protobuf.MessageOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:E\n\x0enanopb_enumopt\x12\x1c.google.protobuf.EnumOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions:>\n\x06nanopb\x12\x1d.google.protobuf.FieldOptions\x18\xf2\x07 \x01(\x0b\x32\x0e.NanoPBOptions')
+
+_FIELDTYPE = descriptor.EnumDescriptor(
+  name='FieldType',
+  full_name='FieldType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    descriptor.EnumValueDescriptor(
+      name='FT_DEFAULT', index=0, number=0,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='FT_CALLBACK', index=1, number=1,
+      options=None,
+      type=None),
+    descriptor.EnumValueDescriptor(
+      name='FT_STATIC', index=2, number=2,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=168,
+  serialized_end=227,
+)
 
 
+FT_DEFAULT = 0
+FT_CALLBACK = 1
+FT_STATIC = 2
+
+NANOPB_FILEOPT_FIELD_NUMBER = 1010
+nanopb_fileopt = descriptor.FieldDescriptor(
+  name='nanopb_fileopt', full_name='nanopb_fileopt', index=0,
+  number=1010, type=11, cpp_type=10, label=1,
+  has_default_value=False, default_value=None,
+  message_type=None, enum_type=None, containing_type=None,
+  is_extension=True, extension_scope=None,
+  options=None)
+NANOPB_MSGOPT_FIELD_NUMBER = 1010
+nanopb_msgopt = descriptor.FieldDescriptor(
+  name='nanopb_msgopt', full_name='nanopb_msgopt', index=1,
+  number=1010, type=11, cpp_type=10, label=1,
+  has_default_value=False, default_value=None,
+  message_type=None, enum_type=None, containing_type=None,
+  is_extension=True, extension_scope=None,
+  options=None)
+NANOPB_ENUMOPT_FIELD_NUMBER = 1010
+nanopb_enumopt = descriptor.FieldDescriptor(
+  name='nanopb_enumopt', full_name='nanopb_enumopt', index=2,
+  number=1010, type=11, cpp_type=10, label=1,
+  has_default_value=False, default_value=None,
+  message_type=None, enum_type=None, containing_type=None,
+  is_extension=True, extension_scope=None,
+  options=None)
 NANOPB_FIELD_NUMBER = 1010
 nanopb = descriptor.FieldDescriptor(
-  name='nanopb', full_name='nanopb', index=0,
+  name='nanopb', full_name='nanopb', index=3,
   number=1010, type=11, cpp_type=10, label=1,
   has_default_value=False, default_value=None,
   message_type=None, enum_type=None, containing_type=None,
@@ -47,9 +100,16 @@ _NANOPBOPTIONS = descriptor.Descriptor(
       is_extension=False, extension_scope=None,
       options=None),
     descriptor.FieldDescriptor(
-      name='pointer', full_name='NanoPBOptions.pointer', index=2,
-      number=3, type=8, cpp_type=7, label=1,
-      has_default_value=False, default_value=False,
+      name='type', full_name='NanoPBOptions.type', index=2,
+      number=3, type=14, cpp_type=8, label=1,
+      has_default_value=True, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    descriptor.FieldDescriptor(
+      name='long_names', full_name='NanoPBOptions.long_names', index=3,
+      number=4, type=8, cpp_type=7, label=1,
+      has_default_value=True, default_value=True,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None),
@@ -63,9 +123,10 @@ _NANOPBOPTIONS = descriptor.Descriptor(
   is_extendable=False,
   extension_ranges=[],
   serialized_start=50,
-  serialized_end=119,
+  serialized_end=166,
 )
 
+_NANOPBOPTIONS.fields_by_name['type'].enum_type = _FIELDTYPE
 DESCRIPTOR.message_types_by_name['NanoPBOptions'] = _NANOPBOPTIONS
 
 class NanoPBOptions(message.Message):
@@ -74,6 +135,12 @@ class NanoPBOptions(message.Message):
   
   # @@protoc_insertion_point(class_scope:NanoPBOptions)
 
+nanopb_fileopt.message_type = _NANOPBOPTIONS
+google.protobuf.descriptor_pb2.FileOptions.RegisterExtension(nanopb_fileopt)
+nanopb_msgopt.message_type = _NANOPBOPTIONS
+google.protobuf.descriptor_pb2.MessageOptions.RegisterExtension(nanopb_msgopt)
+nanopb_enumopt.message_type = _NANOPBOPTIONS
+google.protobuf.descriptor_pb2.EnumOptions.RegisterExtension(nanopb_enumopt)
 nanopb.message_type = _NANOPBOPTIONS
 google.protobuf.descriptor_pb2.FieldOptions.RegisterExtension(nanopb)
 # @@protoc_insertion_point(module_scope)

pb.h

@@ -6,6 +6,8 @@
  * see pb_encode.h or pb_decode.h
  */
 
+#define NANOPB_VERSION nanopb-0.1.8
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
@@ -17,6 +19,30 @@
 #define pb_packed
 #endif
 
+/* Handly macro for suppressing unreferenced-parameter compiler warnings.    */
+#ifndef UNUSED
+#define UNUSED(x) (void)(x)
+#endif
+
+/* Compile-time assertion, used for checking compatible compilation options.
+ * If this fails on your compiler for some reason, use #define STATIC_ASSERT
+ * to disable it. */
+#ifndef STATIC_ASSERT
+#define STATIC_ASSERT(COND,MSG) typedef char STATIC_ASSERT_MSG(MSG, __LINE__, __COUNTER__)[(COND)?1:-1];
+#define STATIC_ASSERT_MSG(MSG, LINE, COUNTER) STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
+#define STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) static_assertion_##MSG##LINE##COUNTER
+#endif
+
+/* Number of required fields to keep track of
+ * (change here or on compiler command line). */
+#ifndef PB_MAX_REQUIRED_FIELDS
+#define PB_MAX_REQUIRED_FIELDS 64
+#endif
+
+#if PB_MAX_REQUIRED_FIELDS < 64
+#error You should not lower PB_MAX_REQUIRED_FIELDS from the default value (64).
+#endif
+
 /* List of possible field types. These are used in the autogenerated code.
  * Least-significant 4 bits tell the scalar type
  * Most-significant 4 bits specify repeated/required/packed etc.
@@ -27,84 +53,98 @@
  * SINT* is different, though, because it is zig-zag coded.
  */
 
-/************************
- * Field contents types *
- ************************/
+typedef enum {
+    /************************
+     * Field contents types *
+     ************************/
+    
+    /* Numeric types */
+    PB_LTYPE_VARINT = 0x00, /* int32, uint32, int64, uint64, bool, enum */
+    PB_LTYPE_SVARINT = 0x01, /* sint32, sint64 */
+    PB_LTYPE_FIXED32 = 0x02, /* fixed32, sfixed32, float */
+    PB_LTYPE_FIXED64 = 0x03, /* fixed64, sfixed64, double */
+    
+    /* Marker for last packable field type. */
+    PB_LTYPE_LAST_PACKABLE = 0x03,
+    
+    /* Byte array with pre-allocated buffer.
+     * data_size is the length of the allocated PB_BYTES_ARRAY structure. */
+    PB_LTYPE_BYTES = 0x04,
+    
+    /* String with pre-allocated buffer.
+     * data_size is the maximum length. */
+    PB_LTYPE_STRING = 0x05,
+    
+    /* Submessage
+     * submsg_fields is pointer to field descriptions */
+    PB_LTYPE_SUBMESSAGE = 0x06,
+    
+    /* Number of declared LTYPES */
+    PB_LTYPES_COUNT = 7,
+    PB_LTYPE_MASK = 0x0F,
+    
+    /******************
+     * Modifier flags *
+     ******************/
+    
+    /* Just the basic, write data at data_offset */
+    PB_HTYPE_REQUIRED = 0x00,
+    
+    /* Write true at size_offset */
+    PB_HTYPE_OPTIONAL = 0x10,
+    
+    /* Read to pre-allocated array
+     * Maximum number of entries is array_size,
+     * actual number is stored at size_offset */
+    PB_HTYPE_ARRAY = 0x20,
+    
+    /* Works for all required/optional/repeated fields.
+     * data_offset points to pb_callback_t structure.
+     * LTYPE should be 0 (it is ignored, but sometimes
+     * used to speculatively index an array). */
+    PB_HTYPE_CALLBACK = 0x30,
+    
+    PB_HTYPE_MASK = 0xF0
+} pb_packed pb_type_t;
 
-typedef uint8_t pb_type_t;
-
-/* Numeric types */
-#define PB_LTYPE_VARINT 0x00 /* int32, uint32, int64, uint64, bool, enum */
-#define PB_LTYPE_SVARINT 0x01 /* sint32, sint64 */
-#define PB_LTYPE_FIXED32 0x02 /* fixed32, sfixed32, float */
-#define PB_LTYPE_FIXED64 0x03 /* fixed64, sfixed64, double */
-
-/* Marker for last packable field type. */
-#define PB_LTYPE_LAST_PACKABLE 0x03
-
-/* Byte array with pre-allocated buffer.
- * data_size is the length of the allocated PB_BYTES_ARRAY structure. */
-#define PB_LTYPE_BYTES 0x04
-
-/* String with pre-allocated buffer.
- * data_size is the maximum length. */
-#define PB_LTYPE_STRING 0x05
-
-/* Submessage
- * submsg_fields is pointer to field descriptions */
-#define PB_LTYPE_SUBMESSAGE 0x06
-
-/* Number of declared LTYPES */
-#define PB_LTYPES_COUNT 7
-
-/******************
- * Modifier flags *
- ******************/
-
-/* Just the basic, write data at data_offset */
-#define PB_HTYPE_REQUIRED 0x00
-
-/* Write true at size_offset */
-#define PB_HTYPE_OPTIONAL 0x10
-
-/* Read to pre-allocated array
- * Maximum number of entries is array_size,
- * actual number is stored at size_offset */
-#define PB_HTYPE_ARRAY 0x20
-
-/* Works for all required/optional/repeated fields.
- * data_offset points to pb_callback_t structure.
- * LTYPE should be 0 (it is ignored, but sometimes
- * used to speculatively index an array). */
-#define PB_HTYPE_CALLBACK 0x30
-
-/* Indicates that a string, bytes or non-repeated submessage is
- * represented using a pointer (char* for string, pb_byptes_array_t
- * for bytes).
- */
-#define PB_HTYPE_POINTER 0x80
-
-#define PB_POINTER(x) ((x) & PB_HTYPE_POINTER)
-#define PB_HTYPE(x) ((x) & 0x70)
-#define PB_LTYPE(x) ((x) & 0x0F)
+#define PB_HTYPE(x) ((x) & PB_HTYPE_MASK)
+#define PB_LTYPE(x) ((x) & PB_LTYPE_MASK)
 
 /* This structure is used in auto-generated constants
  * to specify struct fields.
- * You can change field sizes here if you need structures
+ * You can change field sizes if you need structures
  * larger than 256 bytes or field tags larger than 256.
  * The compiler should complain if your .proto has such
- * structures ("initializer too large for type").
+ * structures. Fix that by defining PB_FIELD_16BIT or
+ * PB_FIELD_32BIT.
  */
 typedef struct _pb_field_t pb_field_t;
 struct _pb_field_t {
+
+#if !defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
     uint8_t tag;
     pb_type_t type;
     uint8_t data_offset; /* Offset of field data, relative to previous field. */
     int8_t size_offset; /* Offset of array size or has-boolean, relative to data */
     uint8_t data_size; /* Data size in bytes for a single item */
     uint8_t array_size; /* Maximum number of entries in array */
+#elif defined(PB_FIELD_16BIT) && !defined(PB_FIELD_32BIT)
+    uint16_t tag;
+    pb_type_t type;
+    uint8_t data_offset;
+    int8_t size_offset;
+    uint16_t data_size;
+    uint16_t array_size;
+#else
+    uint32_t tag;
+    pb_type_t type;
+    uint8_t data_offset;
+    int8_t size_offset;
+    uint32_t data_size;
+    uint32_t array_size;
+#endif
     
-    /* Pointer to message structure for submessage
+    /* Field definitions for submessage
      * OR default value for all other non-array, non-callback types
      * If null, then field will zeroed. */
     const void *ptr;
@@ -114,48 +154,12 @@ struct _pb_field_t {
  * It has the number of bytes in the beginning, and after that an array.
  * Note that actual structs used will have a different length of bytes array.
  */
-typedef struct {
+struct _pb_bytes_array_t {
     size_t size;
     uint8_t bytes[1];
-} pb_bytes_array_t;
+};
 
-/* This structure is used for dynamically allocated 'bytes' arrays.
- */
-typedef struct {
-    size_t size;
-    size_t alloced;
-    uint8_t *bytes;
-} pb_bytes_t;
-
-/* This macro defines the type of a structure for a message with N
- * fields.
- */
-#define PB_MSG_STRUCT(N) struct {               \
-        unsigned int field_count;               \
-        size_t size;                            \
-        pb_field_t fields[N];                   \
-    }
-
-/* This is the visible type for generated message structures.
- * The actual number of fields at the end will vary by message type.
- */
-typedef PB_MSG_STRUCT(1) pb_message_t;
-
-/* These macros are used to manipulate the has_fields array in
- * generated messages.
- */
-#define PB_FIELD_INDEX(TYPE, FIELD) TYPE ## _ ## FIELD ## _index
-#define PB_FIELD_BYTE(TYPE, FIELD) (PB_FIELD_INDEX(TYPE, FIELD) / 8)
-#define PB_FIELD_MASK(TYPE, FIELD) (1 << (PB_FIELD_INDEX(TYPE, FIELD) & 7))
-#define PB_HAS_FIELD(STRUCT, TYPE, FIELD) \
-    (((STRUCT).has_fields[PB_FIELD_BYTE(TYPE, FIELD)]   \
-      & PB_FIELD_MASK(TYPE, FIELD)) != 0)
-#define PB_SET_FIELD(STRUCT, TYPE, FIELD) \
-    ((STRUCT).has_fields[PB_FIELD_BYTE(TYPE, FIELD)]    \
-     |= PB_FIELD_MASK(TYPE, FIELD))
-#define PB_CLEAR_FIELD(STRUCT, TYPE, FIELD) \
-    ((STRUCT).has_fields[PB_FIELD_BYTE(TYPE, FIELD)]    \
-     &= ~PB_FIELD_MASK(TYPE, FIELD))
+typedef struct _pb_bytes_array_t pb_bytes_array_t;
 
 /* This structure is used for giving the callback function.
  * It is stored in the message structure and filled in by the method that
@@ -177,13 +181,11 @@ typedef PB_MSG_STRUCT(1) pb_message_t;
  */
 typedef struct _pb_istream_t pb_istream_t;
 typedef struct _pb_ostream_t pb_ostream_t;
-typedef struct _pb_strstream_t pb_strstream_t;
 typedef struct _pb_callback_t pb_callback_t;
 struct _pb_callback_t {
     union {
         bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void *arg);
         bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, const void *arg);
-        bool (*encode_buffer)(pb_strstream_t *stream, const pb_field_t *field, const void *arg);
     } funcs;
     
     /* Free arg for use by callback */
@@ -203,7 +205,25 @@ typedef enum {
 #define pb_arraysize(st, m) (pb_membersize(st, m) / pb_membersize(st, m[0]))
 #define pb_delta(st, m1, m2) ((int)offsetof(st, m1) - (int)offsetof(st, m2))
 #define pb_delta_end(st, m1, m2) (offsetof(st, m1) - offsetof(st, m2) - pb_membersize(st, m2))
-#define PB_LAST_FIELD {0,0,0,0}
+#define PB_LAST_FIELD {0,(pb_type_t) 0,0,0,0,0,0}
 
+/* These macros are used for giving out error messages.
+ * They are mostly a debugging aid; the main error information
+ * is the true/false return value from functions.
+ * Some code space can be saved by disabling the error
+ * messages if not used.
+ */
+#ifdef PB_NO_ERRMSG
+#define PB_RETURN_ERROR(stream,msg) return false
+#define PB_GET_ERROR(stream) "(errmsg disabled)"
+#else
+#define PB_RETURN_ERROR(stream,msg) \
+    do {\
+        if ((stream)->errmsg == NULL) \
+            (stream)->errmsg = (msg); \
+        return false; \
+    } while(0)
+#define PB_GET_ERROR(stream) ((stream)->errmsg ? (stream)->errmsg : "(none)")
+#endif
 
 #endif

pb_decode.c

@@ -3,20 +3,18 @@
  * 2011 Petteri Aimonen <jpa@kapsi.fi>
  */
 
-
-#ifdef __GNUC__
-/* Verify that we remember to check all return values for proper error propagation */
-#define checkreturn __attribute__((warn_unused_result))
+/* The warn_unused_result attribute appeared first in gcc-3.4.0 */
+#if !defined(__GNUC__) || ( __GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+    #define checkreturn
 #else
-#define checkreturn
+    /* Verify that we remember to check all return values for proper error propagation */
+    #define checkreturn __attribute__((warn_unused_result))
 #endif
 
+#define NANOPB_INTERNALS
 #include "pb.h"
 #include "pb_decode.h"
 #include <string.h>
-#ifdef MALLOC_HEADER
-# include MALLOC_HEADER
-#endif
 
 typedef bool (*pb_decoder_t)(pb_istream_t *stream, const pb_field_t *field, void *dest) checkreturn;
 
@@ -38,18 +36,6 @@ static const pb_decoder_t PB_DECODERS[PB_LTYPES_COUNT] = {
  * pb_istream *
  **************/
 
-bool checkreturn pb_read(pb_istream_t *stream, uint8_t *buf, size_t count)
-{
-    if (stream->bytes_left < count)
-        return false;
-    
-    if (!stream->callback(stream, buf, count))
-        return false;
-    
-    stream->bytes_left -= count;
-    return true;
-}
-
 static bool checkreturn buf_read(pb_istream_t *stream, uint8_t *buf, size_t count)
 {
     uint8_t *source = (uint8_t*)stream->state;
@@ -61,12 +47,42 @@ static bool checkreturn buf_read(pb_istream_t *stream, uint8_t *buf, size_t coun
     return true;
 }
 
+bool checkreturn pb_read(pb_istream_t *stream, uint8_t *buf, size_t count)
+{
+	if (buf == NULL && stream->callback != buf_read)
+	{
+		/* Skip input bytes */
+		uint8_t tmp[16];
+		while (count > 16)
+		{
+			if (!pb_read(stream, tmp, 16))
+				return false;
+			
+			count -= 16;
+		}
+		
+		return pb_read(stream, tmp, count);
+	}
+
+    if (stream->bytes_left < count)
+        PB_RETURN_ERROR(stream, "end-of-stream");
+    
+    if (!stream->callback(stream, buf, count))
+        PB_RETURN_ERROR(stream, "io error");
+    
+    stream->bytes_left -= count;
+    return true;
+}
+
 pb_istream_t pb_istream_from_buffer(uint8_t *buf, size_t bufsize)
 {
     pb_istream_t stream;
     stream.callback = &buf_read;
     stream.state = buf;
     stream.bytes_left = bufsize;
+#ifndef PB_NO_ERRMSG
+    stream.errmsg = NULL;
+#endif
     return stream;
 }
 
@@ -78,14 +94,14 @@ static bool checkreturn pb_decode_varint32(pb_istream_t *stream, uint32_t *dest)
 {
     uint64_t temp;
     bool status = pb_decode_varint(stream, &temp);
-    *dest = temp;
+    *dest = (uint32_t)temp;
     return status;
 }
 
 bool checkreturn pb_decode_varint(pb_istream_t *stream, uint64_t *dest)
 {
     uint8_t byte;
-    uint8_t bitpos = 0;
+    int bitpos = 0;
     *dest = 0;
     
     while (bitpos < 64 && pb_read(stream, &byte, 1))
@@ -97,7 +113,7 @@ bool checkreturn pb_decode_varint(pb_istream_t *stream, uint64_t *dest)
             return true;
     }
     
-    return false;
+    PB_RETURN_ERROR(stream, "varint overflow");
 }
 
 bool checkreturn pb_skip_varint(pb_istream_t *stream)
@@ -120,12 +136,33 @@ bool checkreturn pb_skip_string(pb_istream_t *stream)
     return pb_read(stream, NULL, length);
 }
 
-/* Currently the wire type related stuff is kept hidden from
- * callbacks. They shouldn't need it. It's better for performance
- * to just assume the correct type and fail safely on corrupt message.
- */
+bool checkreturn pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof)
+{
+    uint32_t temp;
+    *eof = false;
+    *wire_type = (pb_wire_type_t) 0;
+    *tag = 0;
+    
+    if (!pb_decode_varint32(stream, &temp))
+    {
+        if (stream->bytes_left == 0)
+            *eof = true;
 
-static bool checkreturn skip(pb_istream_t *stream, pb_wire_type_t wire_type)
+        return false;
+    }
+    
+    if (temp == 0)
+    {
+        *eof = true; /* Special feature: allow 0-terminated messages. */
+        return false;
+    }
+    
+    *tag = temp >> 3;
+    *wire_type = (pb_wire_type_t)(temp & 7);
+    return true;
+}
+
+bool checkreturn pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type)
 {
     switch (wire_type)
     {
@@ -133,7 +170,7 @@ static bool checkreturn skip(pb_istream_t *stream, pb_wire_type_t wire_type)
         case PB_WT_64BIT: return pb_read(stream, NULL, 8);
         case PB_WT_STRING: return pb_skip_string(stream);
         case PB_WT_32BIT: return pb_read(stream, NULL, 4);
-        default: return false;
+        default: PB_RETURN_ERROR(stream, "invalid wire_type");
     }
 }
 
@@ -163,15 +200,14 @@ static bool checkreturn read_raw_value(pb_istream_t *stream, pb_wire_type_t wire
             *size = 4;
             return pb_read(stream, buf, 4);
         
-        default: return false;
+        default: PB_RETURN_ERROR(stream, "invalid wire_type");
     }
 }
 
 /* Decode string length from stream and return a substream with limited length.
- * Before disposing the substream, remember to copy the substream->state back
- * to stream->state.
+ * Remember to close the substream using pb_close_string_substream().
  */
-static bool checkreturn make_string_substream(pb_istream_t *stream, pb_istream_t *substream)
+bool checkreturn pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream)
 {
     uint32_t size;
     if (!pb_decode_varint32(stream, &size))
@@ -179,28 +215,34 @@ static bool checkreturn make_string_substream(pb_istream_t *stream, pb_istream_t
     
     *substream = *stream;
     if (substream->bytes_left < size)
-        return false;
+        PB_RETURN_ERROR(stream, "parent stream too short");
     
     substream->bytes_left = size;
     stream->bytes_left -= size;
     return true;
 }
 
+void pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream)
+{
+    stream->state = substream->state;
+}
+
 /* Iterator for pb_field_t list */
 typedef struct {
-    const pb_message_t *msg;
-    const pb_field_t *current;
-    int field_index;
-    void *dest_struct;
-    void *pData;
-    void *pSize;
+    const pb_field_t *start; /* Start of the pb_field_t array */
+    const pb_field_t *current; /* Current position of the iterator */
+    int field_index; /* Zero-based index of the field. */
+    int required_field_index; /* Zero-based index that counts only the required fields */
+    void *dest_struct; /* Pointer to the destination structure to decode to */
+    void *pData; /* Pointer where to store current field value */
+    void *pSize; /* Pointer where to store the size of current array field */
 } pb_field_iterator_t;
 
-static void pb_field_init(pb_field_iterator_t *iter, const pb_message_t *msg, void *dest_struct)
+static void pb_field_init(pb_field_iterator_t *iter, const pb_field_t *fields, void *dest_struct)
 {
-    iter->msg = msg;
-    iter->current = msg->fields;
+    iter->start = iter->current = fields;
     iter->field_index = 0;
+    iter->required_field_index = 0;
     iter->pData = (char*)dest_struct + iter->current->data_offset;
     iter->pSize = (char*)iter->pData + iter->current->size_offset;
     iter->dest_struct = dest_struct;
@@ -214,12 +256,16 @@ static bool pb_field_next(pb_field_iterator_t *iter)
     if (PB_HTYPE(iter->current->type) == PB_HTYPE_ARRAY)
         prev_size *= iter->current->array_size;
     
+    if (PB_HTYPE(iter->current->type) == PB_HTYPE_REQUIRED)
+        iter->required_field_index++;
+    
     iter->current++;
     iter->field_index++;
-    if (iter->field_index >= iter->msg->field_count)
+    if (iter->current->tag == 0)
     {
-        iter->current = &iter->msg->fields[0];
+        iter->current = iter->start;
         iter->field_index = 0;
+        iter->required_field_index = 0;
         iter->pData = iter->dest_struct;
         prev_size = 0;
         notwrapped = false;
@@ -230,7 +276,7 @@ static bool pb_field_next(pb_field_iterator_t *iter)
     return notwrapped;
 }
 
-static bool checkreturn pb_field_find(pb_field_iterator_t *iter, int tag)
+static bool checkreturn pb_field_find(pb_field_iterator_t *iter, uint32_t tag)
 {
     int start = iter->field_index;
     
@@ -251,15 +297,13 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
 {
     pb_decoder_t func = PB_DECODERS[PB_LTYPE(iter->current->type)];
     
-#ifndef MALLOC_HEADER
-    if (PB_POINTER(iter->current->type))
-        return false;
-#endif
-    
     switch (PB_HTYPE(iter->current->type))
     {
         case PB_HTYPE_REQUIRED:
+            return func(stream, iter->current, iter->pData);
+            
         case PB_HTYPE_OPTIONAL:
+            *(bool*)iter->pSize = true;
             return func(stream, iter->current, iter->pData);
     
         case PB_HTYPE_ARRAY:
@@ -267,9 +311,10 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                 && PB_LTYPE(iter->current->type) <= PB_LTYPE_LAST_PACKABLE)
             {
                 /* Packed array */
+                bool status;
                 size_t *size = (size_t*)iter->pSize;
                 pb_istream_t substream;
-                if (!make_string_substream(stream, &substream))
+                if (!pb_make_string_substream(stream, &substream))
                     return false;
                 
                 while (substream.bytes_left && *size < iter->current->array_size)
@@ -279,7 +324,9 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                         return false;
                     (*size)++;
                 }
-                return (substream.bytes_left == 0);
+                status = (substream.bytes_left == 0);
+                pb_close_string_substream(stream, &substream);
+                return status;
             }
             else
             {
@@ -287,7 +334,7 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                 size_t *size = (size_t*)iter->pSize;
                 void *pItem = (uint8_t*)iter->pData + iter->current->data_size * (*size);
                 if (*size >= iter->current->array_size)
-                    return false;
+                    PB_RETURN_ERROR(stream, "array overflow");
                 
                 (*size)++;
                 return func(stream, iter->current, pItem);
@@ -298,22 +345,22 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
             pb_callback_t *pCallback = (pb_callback_t*)iter->pData;
             
             if (pCallback->funcs.decode == NULL)
-                return skip(stream, wire_type);
+                return pb_skip_field(stream, wire_type);
             
             if (wire_type == PB_WT_STRING)
             {
                 pb_istream_t substream;
                 
-                if (!make_string_substream(stream, &substream))
+                if (!pb_make_string_substream(stream, &substream))
                     return false;
                 
                 while (substream.bytes_left)
                 {
                     if (!pCallback->funcs.decode(&substream, iter->current, pCallback->arg))
-                        return false;
+                        PB_RETURN_ERROR(stream, "callback failed");
                 }
                 
-                stream->state = substream.state;
+                pb_close_string_substream(stream, &substream);
                 return true;
             }
             else
@@ -335,27 +382,28 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
         }
         
         default:
-            return false;
+            PB_RETURN_ERROR(stream, "invalid field type");
     }
 }
 
 /* Initialize message fields to default values, recursively */
-static void pb_message_set_to_defaults(const pb_message_t *msg, void *dest_struct)
+static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_struct)
 {
     pb_field_iterator_t iter;
-    pb_field_init(&iter, msg, dest_struct);
+    pb_field_init(&iter, fields, dest_struct);
     
-    /* Initialize the has_fields array to zero. */
-    memset(dest_struct, 0, (msg->field_count + 7) / 8);
-
     /* Initialize size/has fields and apply default values */
     do
     {
-        if (iter.field_index >= msg->field_count)
+        if (iter.current->tag == 0)
             continue;
         
-        /* Initialize the size field for repeated fields to 0. */
-        if (PB_HTYPE(iter.current->type) == PB_HTYPE_ARRAY)
+        /* Initialize the size field for optional/repeated fields to 0. */
+        if (PB_HTYPE(iter.current->type) == PB_HTYPE_OPTIONAL)
+        {
+            *(bool*)iter.pSize = false;
+        }
+        else if (PB_HTYPE(iter.current->type) == PB_HTYPE_ARRAY)
         {
             *(size_t*)iter.pSize = 0;
             continue; /* Array is empty, no need to initialize contents */
@@ -368,10 +416,7 @@ static void pb_message_set_to_defaults(const pb_message_t *msg, void *dest_struc
         }
         else if (PB_LTYPE(iter.current->type) == PB_LTYPE_SUBMESSAGE)
         {
-            if (PB_POINTER(iter.current->type) &&
-                (*(void**)iter.pData == NULL))
-                continue;
-            pb_message_set_to_defaults(iter.current->ptr, iter.pData);
+            pb_message_set_to_defaults((const pb_field_t *) iter.current->ptr, iter.pData);
         }
         else if (iter.current->ptr != NULL)
         {
@@ -388,203 +433,165 @@ static void pb_message_set_to_defaults(const pb_message_t *msg, void *dest_struc
  * Decode all fields *
  *********************/
 
-bool checkreturn pb_decode(pb_istream_t *stream, const pb_message_t *msg, void *dest_struct)
+bool checkreturn pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
 {
+    uint8_t fields_seen[(PB_MAX_REQUIRED_FIELDS + 7) / 8] = {0}; /* Used to check for required fields */
     pb_field_iterator_t iter;
-    char *has_fields = dest_struct;
-    unsigned int i;
     
-    pb_message_set_to_defaults(msg, dest_struct);
-    
-    pb_field_init(&iter, msg, dest_struct);
+    pb_field_init(&iter, fields, dest_struct);
     
     while (stream->bytes_left)
     {
-        uint32_t temp;
-        int tag;
+        uint32_t tag;
         pb_wire_type_t wire_type;
-        if (!pb_decode_varint32(stream, &temp))
+        bool eof;
+        
+        if (!pb_decode_tag(stream, &wire_type, &tag, &eof))
         {
-            if (stream->bytes_left == 0)
-                break; /* It was EOF */
+            if (eof)
+                break;
             else
-                return false; /* It was error */
+                return false;
         }
         
-        if (temp == 0)
-            break; /* Special feature: allow 0-terminated messages. */
-        
-        tag = temp >> 3;
-        wire_type = (pb_wire_type_t)(temp & 7);
-        
         if (!pb_field_find(&iter, tag))
         {
             /* No match found, skip data */
-            if (!skip(stream, wire_type))
+            if (!pb_skip_field(stream, wire_type))
                 return false;
             continue;
         }
         
-        has_fields[iter.field_index/8] |= 1 << iter.field_index%8;
+        if (PB_HTYPE(iter.current->type) == PB_HTYPE_REQUIRED
+            && iter.required_field_index < PB_MAX_REQUIRED_FIELDS)
+        {
+            fields_seen[iter.required_field_index >> 3] |= (uint8_t)(1 << (iter.required_field_index & 7));
+        }
             
         if (!decode_field(stream, wire_type, &iter))
             return false;
     }
     
     /* Check that all required fields were present. */
-    for (i = 0; i < msg->field_count; i++)
-    {
-        if (PB_HTYPE(msg->fields[i].type) == PB_HTYPE_REQUIRED &&
-            !(has_fields[i/8] & 1 << (i%8)))
+    pb_field_init(&iter, fields, dest_struct);
+    do {
+        if (PB_HTYPE(iter.current->type) == PB_HTYPE_REQUIRED &&
+            iter.required_field_index < PB_MAX_REQUIRED_FIELDS &&
+            !(fields_seen[iter.required_field_index >> 3] & (1 << (iter.required_field_index & 7))))
         {
-            return false;
+            PB_RETURN_ERROR(stream, "missing required field");
         }
-    }
+    } while (pb_field_next(&iter));
     
     return true;
 }
 
-#ifdef MALLOC_HEADER
-
-/* Clean a single unused field (or unused array element). */
-static bool checkreturn pb_clean_pointer(const pb_field_t *field, void *data)
+bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
 {
-    switch (PB_LTYPE(field->type))
-    {
-    case PB_LTYPE_BYTES:
-    {
-        pb_bytes_t *bytes = (pb_bytes_t*)data;
-        bytes->size = 0;
-        bytes->alloced = 0;
-        free(bytes->bytes);
-        return true;
-    }
-    case PB_LTYPE_STRING:
-    case PB_LTYPE_SUBMESSAGE:
-    {
-        void **obj = (void**)data;
-        free(*obj);
-        *obj = NULL;
-        return true;
-    }
-    default:
-        return false;
-    }
+    pb_message_set_to_defaults(fields, dest_struct);
+    return pb_decode_noinit(stream, fields, dest_struct);
 }
 
-/* Clean unused trailing elements in an array. */
-static bool checkreturn pb_clean_array(const pb_field_t *field, void *data, size_t count)
-{
-    unsigned int i;
-    for (i = count; i < field->array_size; i++)
-    {
-        if (!pb_clean_pointer(field, data))
-            return false;
-        data = (char*)data + field->data_size;
-    }
-    return true;
-}
-
-/* Clean unused fields in a message. */
-bool pb_clean(const pb_message_t *msg, void *dest_struct)
-{
-    const char *has_fields = dest_struct;
-    const void *pSize;
-    char *pData = (char*)dest_struct;
-    size_t prev_size = 0;
-    unsigned int i;
-    
-    for (i = 0; i < msg->field_count; i++)
-    {
-        const pb_field_t *field = &msg->fields[i];
-        bool status;
-        pData = pData + prev_size + field->data_offset;
-        pSize = pData + field->size_offset;
-        prev_size = field->data_size;
-        if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
-            prev_size *= field->array_size;
-        
-        if (!PB_POINTER(field->type))
-            continue;
-        else if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
-            status = pb_clean_array(field, pData, *(size_t*)pSize);
-        else if (!(has_fields[i/8] & 1 << (i%8)))
-            status = pb_clean_pointer(field, pData);
-        else /* pointer field is used */
-            continue;
-        
-        if (!status)
-            return false;
-    }
-    
-    return true;
-}
-
-#endif
-
-
 /* Field decoders */
 
-/* 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)
+bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest)
 {
-#ifdef __BIG_ENDIAN__
-    memcpy(dest, (char*)src + (srcsize - destsize), destsize);
-#else
-    memcpy(dest, src, destsize);
-#endif
+    uint64_t value;
+    if (!pb_decode_varint(stream, &value))
+        return false;
+    
+    if (value & 1)
+        *dest = (int64_t)(~(value >> 1));
+    else
+        *dest = (int64_t)(value >> 1);
+    
+    return true;
+}
+
+bool pb_decode_fixed32(pb_istream_t *stream, void *dest)
+{
+    #ifdef __BIG_ENDIAN__
+    uint8_t *bytes = (uint8_t*)dest;
+    uint8_t lebytes[4];
+    
+    if (!pb_read(stream, lebytes, 4))
+        return false;
+    
+    bytes[0] = lebytes[3];
+    bytes[1] = lebytes[2];
+    bytes[2] = lebytes[1];
+    bytes[3] = lebytes[0];
+    return true;
+    #else
+    return pb_read(stream, (uint8_t*)dest, 4);
+    #endif   
+}
+
+bool pb_decode_fixed64(pb_istream_t *stream, void *dest)
+{
+    #ifdef __BIG_ENDIAN__
+    uint8_t *bytes = (uint8_t*)dest;
+    uint8_t lebytes[8];
+    
+    if (!pb_read(stream, lebytes, 8))
+        return false;
+    
+    bytes[0] = lebytes[7];
+    bytes[1] = lebytes[6];
+    bytes[2] = lebytes[5];
+    bytes[3] = lebytes[4];
+    bytes[4] = lebytes[3];
+    bytes[5] = lebytes[2];
+    bytes[6] = lebytes[1];
+    bytes[7] = lebytes[0];
+    return true;
+    #else
+    return pb_read(stream, (uint8_t*)dest, 8);
+    #endif   
 }
 
 bool checkreturn pb_dec_varint(pb_istream_t *stream, const pb_field_t *field, void *dest)
 {
-    uint64_t temp;
-    bool status = pb_decode_varint(stream, &temp);
-    endian_copy(dest, &temp, field->data_size, sizeof(temp));
+    uint64_t value;
+    bool status = pb_decode_varint(stream, &value);
+    
+    switch (field->data_size)
+    {
+        case 1: *(uint8_t*)dest = (uint8_t)value; break;
+        case 2: *(uint16_t*)dest = (uint16_t)value; break;
+        case 4: *(uint32_t*)dest = (uint32_t)value; break;
+        case 8: *(uint64_t*)dest = value; break;
+        default: PB_RETURN_ERROR(stream, "invalid data_size");
+    }
+    
     return status;
 }
 
 bool checkreturn pb_dec_svarint(pb_istream_t *stream, const pb_field_t *field, void *dest)
 {
-    uint64_t temp;
-    bool status = pb_decode_varint(stream, &temp);
-    temp = (temp >> 1) ^ -(int64_t)(temp & 1);
-    endian_copy(dest, &temp, field->data_size, sizeof(temp));
+    int64_t value;
+    bool status = pb_decode_svarint(stream, &value);
+    
+    switch (field->data_size)
+    {
+        case 4: *(int32_t*)dest = (int32_t)value; break;
+        case 8: *(int64_t*)dest = value; break;
+        default: PB_RETURN_ERROR(stream, "invalid data_size");
+    }
+    
     return status;
 }
 
 bool checkreturn pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, void *dest)
 {
-#ifdef __BIG_ENDIAN__
-    uint8_t bytes[4] = {0};
-    bool status = pb_read(stream, bytes, 4);
-    if (status) {
-      uint8_t bebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]};
-      memcpy(dest, bebytes, 4);
-    }
-    return status;
-#else
-    return pb_read(stream, (uint8_t*)dest, 4);
-#endif
+    UNUSED(field);
+    return pb_decode_fixed32(stream, dest);
 }
 
 bool checkreturn pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, void *dest)
 {
-#ifdef __BIG_ENDIAN__
-    uint8_t bytes[8] = {0};
-    bool status = pb_read(stream, bytes, 8);
-    if (status) {
-      uint8_t bebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4], 
-                            bytes[3], bytes[2], bytes[1], bytes[0]};
-      memcpy(dest, bebytes, 8);
-    }
-    return status;
-#else
-    return pb_read(stream, (uint8_t*)dest, 8);
-#endif
+    UNUSED(field);
+    return pb_decode_fixed64(stream, dest);
 }
 
 bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, void *dest)
@@ -596,26 +603,9 @@ bool checkreturn pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, voi
         return false;
     x->size = temp;
     
-    if (x->size > field->data_size)
-        return false;
-    
-#ifdef MALLOC_HEADER
-    if (PB_POINTER(field->type))
-    {
-        pb_bytes_t *x2 = (pb_bytes_t*)dest;
-        
-        if (x2->alloced < x2->size)
-        {
-            void *new_bytes = realloc(x2->bytes, x2->size);
-            if (!new_bytes)
-                return false;
-            x2->alloced = x2->size;
-            x2->bytes = new_bytes;
-        }
-        
-        return pb_read(stream, x2->bytes, x2->size);
-    }
-#endif
+    /* Check length, noting the space taken by the size_t header. */
+    if (x->size > field->data_size - offsetof(pb_bytes_array_t, bytes))
+        PB_RETURN_ERROR(stream, "bytes overflow");
     
     return pb_read(stream, x->bytes, x->size);
 }
@@ -627,20 +617,9 @@ bool checkreturn pb_dec_string(pb_istream_t *stream, const pb_field_t *field, vo
     if (!pb_decode_varint32(stream, &size))
         return false;
     
-    if (size > field->data_size - 1)
-        return false;
-    
-#ifdef MALLOC_HEADER
-    if (PB_POINTER(field->type))
-    {
-        uint8_t *string = (uint8_t*)realloc(*(uint8_t**)dest, size + 1);
-        if (!string)
-            return false;
-        
-        *(uint8_t**)dest = string;
-        dest = string;
-    }
-#endif
+    /* Check length, noting the null terminator */
+    if (size + 1 > field->data_size)
+        PB_RETURN_ERROR(stream, "string overflow");
     
     status = pb_read(stream, (uint8_t*)dest, size);
     *((uint8_t*)dest + size) = 0;
@@ -651,34 +630,21 @@ bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field
 {
     bool status;
     pb_istream_t substream;
-    const pb_message_t *msg;
+    const pb_field_t* submsg_fields = (const pb_field_t*)field->ptr;
     
-    if (!make_string_substream(stream, &substream))
+    if (!pb_make_string_substream(stream, &substream))
         return false;
     
     if (field->ptr == NULL)
-        return false;
+        PB_RETURN_ERROR(stream, "invalid field descriptor");
     
-    msg = (const pb_message_t*)field->ptr;
+    /* New array entries need to be initialized, while required and optional
+     * submessages have already been initialized in the top-level pb_decode. */
+    if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
+        status = pb_decode(&substream, submsg_fields, dest);
+    else
+        status = pb_decode_noinit(&substream, submsg_fields, dest);
     
-#ifdef MALLOC_HEADER
-    if (PB_POINTER(field->type))
-    {
-        if (*(void**)dest == NULL)
-        {
-            void *object = calloc(1, msg->size);
-            if (!object)
-                return false;
-            *(void**)dest = object;
-            pb_message_set_to_defaults(msg, object);
-            dest = object;
-        } else {
-            dest = *(void**)dest;
-        }
-    }
-#endif
-    
-    status = pb_decode(&substream, msg, dest);
-    stream->state = substream.state;
+    pb_close_string_substream(stream, &substream);
     return status;
 }

pb_decode.h

@@ -3,7 +3,7 @@
 
 /* pb_decode.h: Functions to decode protocol buffers. Depends on pb_decode.c.
  * The main function is pb_decode. You will also need to create an input
- * stream, which is easiest to do with pb_istream_t.
+ * stream, which is easiest to do with pb_istream_from_buffer().
  * 
  * You also need structures and their corresponding pb_field_t descriptions.
  * These are usually generated from .proto-files with a script.
@@ -12,6 +12,10 @@
 #include <stdbool.h>
 #include "pb.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Lightweight input stream.
  * You can provide a callback function for reading or use
  * pb_istream_from_buffer.
@@ -19,12 +23,10 @@
  * Rules for callback:
  * 1) Return false on IO errors. This will cause decoding to abort.
  * 
- * 2) If buf is NULL, read but don't store bytes ("skip input").
- * 
- * 3) You can use state to store your own data (e.g. buffer pointer),
+ * 2) You can use state to store your own data (e.g. buffer pointer),
  * and rely on pb_read to verify that no-body reads past bytes_left.
  * 
- * 4) Your callback may be used with substreams, in which case bytes_left
+ * 3) Your callback may be used with substreams, in which case bytes_left
  * is different than from the main stream. Don't use bytes_left to compute
  * any pointers.
  */
@@ -33,6 +35,10 @@ struct _pb_istream_t
     bool (*callback)(pb_istream_t *stream, uint8_t *buf, size_t count);
     void *state; /* Free field for use by callback implementation */
     size_t bytes_left;
+    
+#ifndef PB_NO_ERRMSG
+    const char *errmsg;
+#endif
 };
 
 pb_istream_t pb_istream_from_buffer(uint8_t *buf, size_t bufsize);
@@ -40,25 +46,53 @@ bool pb_read(pb_istream_t *stream, uint8_t *buf, size_t count);
 
 /* Decode from stream to destination struct.
  * Returns true on success, false on any failure.
- * The actual struct pointed to by dest must match the description in msg.
+ * The actual struct pointed to by dest must match the description in fields.
  */
-bool pb_decode(pb_istream_t *stream, const pb_message_t *msg, void *dest_struct);
+bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
+
+/* Same as pb_decode, except does not initialize the destination structure
+ * to default values. This is slightly faster if you need no default values
+ * and just do memset(struct, 0, sizeof(struct)) yourself.
+ */
+bool pb_decode_noinit(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
 
 /* --- Helper functions ---
  * You may want to use these from your caller or callbacks.
  */
 
+/* Decode the tag for the next field in the stream. Gives the wire type and
+ * field tag. At end of the message, returns false and sets eof to true. */
+bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof);
+
+/* Skip the field payload data, given the wire type. */
+bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
+
+/* Decode an integer in the varint format. This works for bool, enum, int32,
+ * int64, uint32 and uint64 field types. */
 bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
 
-bool pb_skip_varint(pb_istream_t *stream);
-bool pb_skip_string(pb_istream_t *stream);
+/* Decode an integer in the zig-zagged svarint format. This works for sint32
+ * and sint64. */
+bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
 
-/* --- Field decoders ---
- * Each decoder takes stream and field description, and a pointer to the field
- * in the destination struct (dest = struct_addr + field->data_offset).
- * For arrays, these functions are called repeatedly.
+/* Decode a fixed32, sfixed32 or float value. You need to pass a pointer to
+ * a 4-byte wide C variable. */
+bool pb_decode_fixed32(pb_istream_t *stream, void *dest);
+
+/* Decode a fixed64, sfixed64 or double value. You need to pass a pointer to
+ * a 8-byte wide C variable. */
+bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
+
+/* Make a limited-length substream for reading a PB_WT_STRING field. */
+bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
+void pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
+
+/* --- Internal functions ---
+ * These functions are not terribly useful for the average library user, but
+ * are exported to make the unit testing and extending nanopb easier.
  */
 
+#ifdef NANOPB_INTERNALS
 bool pb_dec_varint(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);
 bool pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, void *dest);
@@ -68,10 +102,12 @@ bool pb_dec_bytes(pb_istream_t *stream, const pb_field_t *field, void *dest);
 bool pb_dec_string(pb_istream_t *stream, const pb_field_t *field, void *dest);
 bool pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field, void *dest);
 
-/* Release memory and clear pointers for any unused elements of
- * dest_struct.  This function is only compiled when MALLOC_HEADER is
- * defined for pb_decode.c.
- */
-bool pb_clean(const pb_message_t *msg, void *dest_struct);
+bool pb_skip_varint(pb_istream_t *stream);
+bool pb_skip_string(pb_istream_t *stream);
+#endif
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
 
 #endif

pb_encode.c

@@ -3,18 +3,19 @@
  * 2011 Petteri Aimonen <jpa@kapsi.fi>
  */
 
+#define NANOPB_INTERNALS
 #include "pb.h"
 #include "pb_encode.h"
 #include <string.h>
 
-#ifdef __GNUC__
-/* Verify that we remember to check all return values for proper error propagation */
-#define checkreturn __attribute__((warn_unused_result))
+/* The warn_unused_result attribute appeared first in gcc-3.4.0 */
+#if !defined(__GNUC__) || ( __GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+    #define checkreturn
 #else
-#define checkreturn
+    /* Verify that we remember to check all return values for proper error propagation */
+    #define checkreturn __attribute__((warn_unused_result))
 #endif
 
-
 typedef bool (*pb_encoder_t)(pb_ostream_t *stream, const pb_field_t *field, const void *src) checkreturn;
 
 /* --- Function pointers to field encoders ---
@@ -75,7 +76,7 @@ bool checkreturn pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count
 static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *field,
                          const void *pData, size_t count, pb_encoder_t func)
 {
-    int i;
+    size_t i;
     const void *p;
     size_t size;
     
@@ -98,7 +99,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
         }
         else
         {
-            pb_ostream_t sizestream = {0};
+            pb_ostream_t sizestream = {0,0,0,0};
             p = pData;
             for (i = 0; i < count; i++)
             {
@@ -109,7 +110,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
             size = sizestream.bytes_written;
         }
         
-        if (!pb_encode_varint(stream, size))
+        if (!pb_encode_varint(stream, (uint64_t)size))
             return false;
         
         if (stream->callback == NULL)
@@ -140,17 +141,15 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
     return true;
 }
 
-bool checkreturn pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const void *src_struct)
+bool checkreturn pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct)
 {
+    const pb_field_t *field = fields;
     const void *pData = src_struct;
     const void *pSize;
-    const char *has_fields = src_struct;
-    unsigned int i;
     size_t prev_size = 0;
     
-    for (i = 0; i < msg->field_count; i++)
+    while (field->tag != 0)
     {
-        const pb_field_t *field = &msg->fields[i];
         pb_encoder_t func = PB_ENCODERS[PB_LTYPE(field->type)];
         pData = (const char*)pData + prev_size + field->data_offset;
         pSize = (const char*)pData + field->size_offset;
@@ -161,16 +160,6 @@ bool checkreturn pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const
                 
         switch (PB_HTYPE(field->type))
         {
-            case PB_HTYPE_OPTIONAL:
-                if (!(has_fields[i/8] & (1 << i%8)))
-                    break;
-                if (PB_POINTER(field->type)
-                    && (PB_LTYPE(field->type) == PB_LTYPE_STRING
-                        || PB_LTYPE(field->type) == PB_LTYPE_SUBMESSAGE)
-                    && *(void**)pData == NULL)
-                    break;
-                /* else fall through to required case */
-            
             case PB_HTYPE_REQUIRED:
                 if (!pb_encode_tag_for_field(stream, field))
                     return false;
@@ -178,14 +167,25 @@ bool checkreturn pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const
                     return false;
                 break;
             
+            case PB_HTYPE_OPTIONAL:
+                if (*(const bool*)pSize)
+                {
+                    if (!pb_encode_tag_for_field(stream, field))
+                        return false;
+                
+                    if (!func(stream, field, pData))
+                        return false;
+                }
+                break;
+            
             case PB_HTYPE_ARRAY:
-                if (!encode_array(stream, field, pData, *(size_t*)pSize, func))
+                if (!encode_array(stream, field, pData, *(const size_t*)pSize, func))
                     return false;
                 break;
             
             case PB_HTYPE_CALLBACK:
             {
-                pb_callback_t *callback = (pb_callback_t*)pData;
+                const pb_callback_t *callback = (const pb_callback_t*)pData;
                 if (callback->funcs.encode != NULL)
                 {
                     if (!callback->funcs.encode(stream, field, callback->arg))
@@ -194,6 +194,8 @@ bool checkreturn pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const
                 break;
             }
         }
+    
+        field++;
     }
     
     return true;
@@ -203,14 +205,14 @@ bool checkreturn pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const
 bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
 {
     uint8_t buffer[10];
-    int i = 0;
+    size_t i = 0;
     
     if (value == 0)
         return pb_write(stream, (uint8_t*)&value, 1);
     
     while (value)
     {
-        buffer[i] = (value & 0x7F) | 0x80;
+        buffer[i] = (uint8_t)((value & 0x7F) | 0x80);
         value >>= 7;
         i++;
     }
@@ -219,9 +221,54 @@ bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
     return pb_write(stream, buffer, i);
 }
 
-bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number)
+bool checkreturn pb_encode_svarint(pb_ostream_t *stream, int64_t value)
 {
-    int tag = wiretype | (field_number << 3);
+    uint64_t zigzagged;
+    if (value < 0)
+        zigzagged = (uint64_t)(~(value << 1));
+    else
+        zigzagged = (uint64_t)(value << 1);
+    
+    return pb_encode_varint(stream, zigzagged);
+}
+
+bool checkreturn pb_encode_fixed32(pb_ostream_t *stream, const void *value)
+{
+    #ifdef __BIG_ENDIAN__
+    const uint8_t *bytes = value;
+    uint8_t lebytes[4];
+    lebytes[0] = bytes[3];
+    lebytes[1] = bytes[2];
+    lebytes[2] = bytes[1];
+    lebytes[3] = bytes[0];
+    return pb_write(stream, lebytes, 4);
+    #else
+    return pb_write(stream, (const uint8_t*)value, 4);
+    #endif
+}
+
+bool checkreturn pb_encode_fixed64(pb_ostream_t *stream, const void *value)
+{
+    #ifdef __BIG_ENDIAN__
+    const uint8_t *bytes = value;
+    uint8_t lebytes[8];
+    lebytes[0] = bytes[7];
+    lebytes[1] = bytes[6];
+    lebytes[2] = bytes[5];
+    lebytes[3] = bytes[4];
+    lebytes[4] = bytes[3];
+    lebytes[5] = bytes[2];
+    lebytes[6] = bytes[1];
+    lebytes[7] = bytes[0];
+    return pb_write(stream, lebytes, 8);
+    #else
+    return pb_write(stream, (const uint8_t*)value, 8);
+    #endif
+}
+
+bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number)
+{
+    uint64_t tag = wiretype | (field_number << 3);
     return pb_encode_varint(stream, tag);
 }
 
@@ -258,119 +305,25 @@ bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t
 
 bool checkreturn pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size)
 {
-    if (!pb_encode_varint(stream, size))
+    if (!pb_encode_varint(stream, (uint64_t)size))
         return false;
     
     return pb_write(stream, buffer, size);
 }
 
-/* Field encoders */
-
-/* Copy srcsize bytes from src so that values are casted properly.
- * On little endian machine, copy to start of dest
- * On big endian machine, copy to end of dest
- * destsize must always be larger than srcsize
- * 
- * Note: This is the reverse of the endian_copy in pb_decode.c.
- */
-static void endian_copy(void *dest, const void *src, size_t destsize, size_t srcsize)
+bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct)
 {
-#ifdef __BIG_ENDIAN__
-    memcpy((char*)dest + (destsize - srcsize), src, srcsize);
-#else
-    memcpy(dest, src, srcsize);
-#endif
-}
-
-bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    uint64_t value = 0;
-    endian_copy(&value, src, sizeof(value), field->data_size);
-    return pb_encode_varint(stream, value);
-}
-
-bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    uint64_t value = 0;
-    uint64_t zigzagged;
-    uint64_t signbitmask, xormask;
-    endian_copy(&value, src, sizeof(value), field->data_size);
-    
-    signbitmask = (uint64_t)0x80 << (field->data_size * 8 - 8);
-    xormask = ((uint64_t)-1) >> (64 - field->data_size * 8);
-    if (value & signbitmask)
-        zigzagged = ((value ^ xormask) << 1) | 1;
-    else
-        zigzagged = value << 1;
-    
-    return pb_encode_varint(stream, zigzagged);
-}
-
-bool checkreturn pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    #ifdef __BIG_ENDIAN__
-    uint8_t bytes[8] = {0};
-    memcpy(bytes, src, 8);
-    uint8_t lebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4], 
-                          bytes[3], bytes[2], bytes[1], bytes[0]};
-    return pb_write(stream, lebytes, 8);
-    #else
-    return pb_write(stream, (uint8_t*)src, 8);
-    #endif
-}
-
-bool checkreturn pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    #ifdef __BIG_ENDIAN__
-    uint8_t bytes[4] = {0};
-    memcpy(bytes, src, 4);
-    uint8_t lebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]};
-    return pb_write(stream, lebytes, 4);
-    #else
-    return pb_write(stream, (uint8_t*)src, 4);
-    #endif
-}
-
-bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    if ((field != NULL) && PB_POINTER(field->type)) {
-        pb_bytes_t *bytes = (pb_bytes_t*)src;
-        return pb_encode_string(stream, bytes->bytes, bytes->size);
-    } else {
-        pb_bytes_array_t *bytes = (pb_bytes_array_t*)src;
-        return pb_encode_string(stream, bytes->bytes, bytes->size);
-    }
-}
-
-bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    size_t len;
-    if ((field != NULL) && PB_POINTER(field->type))
-        src = *(char**)src;
-    len = src ? strlen((char*)src) : 0;
-    return pb_encode_string(stream, (uint8_t*)src, len);
-}
-
-bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
-{
-    pb_ostream_t substream = {0};
+    /* First calculate the message size using a non-writing substream. */
+    pb_ostream_t substream = {0,0,0,0};
     size_t size;
     bool status;
     
-    if (field->ptr == NULL)
-        return false;
-    
-    if (PB_POINTER(field->type)) {
-        src = *(void**)src;
-        if (src == NULL)
-            return false;
-    }
-    if (!pb_encode(&substream, (const pb_message_t*)field->ptr, src))
+    if (!pb_encode(&substream, fields, src_struct))
         return false;
     
     size = substream.bytes_written;
     
-    if (!pb_encode_varint(stream, size))
+    if (!pb_encode_varint(stream, (uint64_t)size))
         return false;
     
     if (stream->callback == NULL)
@@ -386,7 +339,7 @@ bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field
     substream.max_size = size;
     substream.bytes_written = 0;
     
-    status = pb_encode(&substream, (const pb_message_t*)field->ptr, src);
+    status = pb_encode(&substream, fields, src_struct);
     
     stream->bytes_written += substream.bytes_written;
     stream->state = substream.state;
@@ -397,3 +350,68 @@ bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field
     return status;
 }
 
+/* Field encoders */
+
+bool checkreturn pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    uint64_t value = 0;
+    
+    switch (field->data_size)
+    {
+        case 1: value = *(const uint8_t*)src; break;
+        case 2: value = *(const uint16_t*)src; break;
+        case 4: value = *(const uint32_t*)src; break;
+        case 8: value = *(const uint64_t*)src; break;
+        default: return false;
+    }
+    
+    return pb_encode_varint(stream, value);
+}
+
+bool checkreturn pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    int64_t value = 0;
+    
+    switch (field->data_size)
+    {
+        case 4: value = *(const int32_t*)src; break;
+        case 8: value = *(const int64_t*)src; break;
+        default: return false;
+    }
+    
+    return pb_encode_svarint(stream, value);
+}
+
+bool checkreturn pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    UNUSED(field);
+    return pb_encode_fixed64(stream, src);
+}
+
+bool checkreturn pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    UNUSED(field);
+    return pb_encode_fixed32(stream, src);
+}
+
+bool checkreturn pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    const pb_bytes_array_t *bytes = (const pb_bytes_array_t*)src;
+    UNUSED(field);
+    return pb_encode_string(stream, bytes->bytes, bytes->size);
+}
+
+bool checkreturn pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    UNUSED(field);
+    return pb_encode_string(stream, (const uint8_t*)src, strlen((const char*)src));
+}
+
+bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    if (field->ptr == NULL)
+        return false;
+    
+    return pb_encode_submessage(stream, (const pb_field_t*)field->ptr, src);
+}
+

pb_encode.h

@@ -9,6 +9,10 @@
 #include <stdbool.h>
 #include "pb.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Lightweight output stream.
  * You can provide callback for writing or use pb_ostream_from_buffer.
  * 
@@ -39,34 +43,68 @@ bool pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count);
 
 /* Encode struct to given output stream.
  * Returns true on success, false on any failure.
- * The actual struct pointed to by src_struct must match the description in msg.
+ * The actual struct pointed to by src_struct must match the description in fields.
  * All required fields in the struct are assumed to have been filled in.
  */
-bool pb_encode(pb_ostream_t *stream, const pb_message_t *msg, const void *src_struct);
+bool pb_encode(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
 
 /* --- Helper functions ---
  * You may want to use these from your caller or callbacks.
  */
 
-bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
-bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number);
-/* Encode tag based on LTYPE and field number defined in the field structure. */
+/* Encode field header based on LTYPE and field number defined in the field structure.
+ * Call this from the callback before writing out field contents. */
 bool pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field);
-/* Write length as varint and then the contents of buffer. */
+
+/* Encode field header by manually specifing wire type. You need to use this if
+ * you want to write out packed arrays from a callback field. */
+bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number);
+
+/* Encode an integer in the varint format.
+ * This works for bool, enum, int32, int64, uint32 and uint64 field types. */
+bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
+
+/* Encode an integer in the zig-zagged svarint format.
+ * This works for sint32 and sint64. */
+bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
+
+/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
 bool pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size);
 
-/* --- Field encoders ---
- * Each encoder writes the content for the field.
- * The tag/wire type has been written already.
+/* Encode a fixed32, sfixed32 or float value.
+ * You need to pass a pointer to a 4-byte wide C variable. */
+bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
+
+/* Encode a fixed64, sfixed64 or double value.
+ * You need to pass a pointer to a 8-byte wide C variable. */
+bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
+
+/* Encode a submessage field.
+ * You need to pass the pb_field_t array and pointer to struct, just like with pb_encode().
+ * This internally encodes the submessage twice, first to calculate message size and then to actually write it out.
+ */
+bool pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct);
+
+/* --- Internal functions ---
+ * These functions are not terribly useful for the average library user, but
+ * are exported to make the unit testing and extending nanopb easier.
  */
 
+#ifdef NANOPB_INTERNALS
 bool pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src);
 bool pb_enc_svarint(pb_ostream_t *stream, const pb_field_t *field, const void *src);
 bool pb_enc_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *src);
 bool pb_enc_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *src);
-
 bool pb_enc_bytes(pb_ostream_t *stream, const pb_field_t *field, const void *src);
 bool pb_enc_string(pb_ostream_t *stream, const pb_field_t *field, const void *src);
+#endif
+
+/* This function is not recommended for new programs. Use pb_encode_submessage()
+ * instead, it has the same functionality with a less confusing interface. */
 bool pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #endif

pb_encode_buffer.c

@@ -1,362 +0,0 @@
-/* pb_encode_buffer.c - encode a protobuf to an in-memory array
- *
- * 2011 Michael Poole <mdpoole@troilus.org>
- * Part of nanopb, 2011 Petteri Aimonen <jpa@kapsi.fi>
- */
-
-#include "pb_encode_buffer.h"
-#include <string.h>
-
-#ifdef __GNUC__
-/* Verify that we remember to check all return values for proper error propagation */
-#define checkreturn __attribute__((warn_unused_result))
-#else
-#define checkreturn
-#endif
-
-typedef bool (*pb_encoder_t)(pb_strstream_t *stream, const pb_field_t *field, const void *src) checkreturn;
-
-static bool pb_encb_varint(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_svarint(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_fixed32(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_fixed64(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_bytes(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_string(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-static bool pb_encb_submessage(pb_strstream_t *stream, const pb_field_t *field, const void *src);
-
-/* --- Function pointers to field encoders ---
- * Order in the array must match pb_action_t LTYPE numbering.
- */
-static const pb_encoder_t PB_ENCODERS[PB_LTYPES_COUNT] = {
-    &pb_encb_varint,
-    &pb_encb_svarint,
-    &pb_encb_fixed32,
-    &pb_encb_fixed64,
-    
-    &pb_encb_bytes,
-    &pb_encb_string,
-    &pb_encb_submessage
-};
-
-/* pb_strstream_t implementation */
-
-pb_strstream_t pb_strstream_from_buffer(uint8_t *buf, size_t bufsize)
-{
-    pb_strstream_t stream;
-    stream.buffer = buf;
-    stream.last = buf + bufsize;
-    return stream;
-}
-
-bool pb_buf_write(pb_strstream_t *stream, const uint8_t *buf, size_t count)
-{
-    if (stream->buffer + count > stream->last)
-        return false;
-    stream->last -= count;
-    memcpy(stream->last, buf, count);
-    return true;
-}
-
-/* Main encoding stuff */
-
-/* This function is static for the same reason as the version in
- * pb_encode.c.
- */
-static bool checkreturn encode_array(pb_strstream_t *stream, const pb_field_t *field,
-                                     const void *pData, size_t count, pb_encoder_t func)
-{
-    const void *p;
-    uint8_t *start;
-    size_t size;
-    int i;
-    
-    if (count == 0)
-        return true;
-    
-    start = stream->last;
-    p = (const char*)pData + field->data_size * count;
-    
-    if (PB_LTYPE(field->type) <= PB_LTYPE_LAST_PACKABLE)
-    {
-        /* Write the data (in reverse order). */
-        for (i = 0; i < count; i++)
-        {
-            p = (const char*)p - field->data_size;
-            if (!func(stream, field, p))
-                return false;
-        }
-        
-        /* Write the size. */
-        size = start - stream->last;
-        if (!pb_encbuf_varint(stream, size))
-            return false;
-        if (!pb_encbuf_tag(stream, PB_WT_STRING, field->tag))
-            return false;
-    }
-    else
-    {
-        for (i = 0; i < count; i++)
-        {
-            p = (const char*)p - field->data_size;
-            if (!func(stream, field, p))
-                return false;
-            if (!pb_encbuf_tag_for_field(stream, field))
-                return false;
-        }
-    }
-    
-    return true;
-}
-
-bool checkreturn pb_encode_buffer(pb_strstream_t *stream, const pb_message_t *msg, const void *src_struct)
-{
-    const char *has_fields = src_struct;
-    const uint8_t *pData = src_struct;
-    const pb_field_t *field;
-    pb_encoder_t func;
-    size_t size;
-    unsigned int i;
-
-    /* msg->size includes trailing padding, so we must calculate the
-     * offset of the last field by counting forward from the start.
-     */
-    for (i = 0; i < msg->field_count; i++)
-    {
-        field = &msg->fields[i];
-        pData += field->data_offset;
-        size = field->data_size;
-        if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
-            size *= field->array_size;
-        pData += size;
-    }
-
-    /* Iterate through the fields in reverse order.  Because we write
-     * from the end of the buffer, the result is in canonical order.
-     */
-    for (i = msg->field_count; i > 0; pData -= field->data_offset)
-    {
-        field = &msg->fields[--i];
-        func = PB_ENCODERS[PB_LTYPE(field->type)];
-        size = field->data_size;
-        if (PB_HTYPE(field->type) == PB_HTYPE_ARRAY)
-            size *= field->array_size;
-        pData -= size;
-        
-        switch (PB_HTYPE(field->type))
-        {
-        case PB_HTYPE_OPTIONAL:
-            if (!(has_fields[i/8] & (1 << i%8)))
-                break;
-            if (PB_POINTER(field->type)
-                && (PB_LTYPE(field->type) == PB_LTYPE_STRING
-                        || PB_LTYPE(field->type) == PB_LTYPE_SUBMESSAGE)
-                    && *(void**)pData == NULL)
-                    break;
-                /* else fall through to required case */
-
-        case PB_HTYPE_REQUIRED:
-            if (!func(stream, field, pData))
-                return false;
-            if (!pb_encbuf_tag_for_field(stream, field))
-                return false;
-            break;
-
-        case PB_HTYPE_ARRAY:
-            size = *(size_t*)(pData + field->size_offset);
-            if (!encode_array(stream, field, pData, size, func))
-                return false;
-            break;
-
-        case PB_HTYPE_CALLBACK:
-        {
-            pb_callback_t *callback = (pb_callback_t*)pData;
-            if (callback->funcs.encode_buffer != NULL
-                && !callback->funcs.encode_buffer(stream, field, callback->arg))
-                return false;
-            break;
-        }
-        }
-    }
-    
-    return true;
-}
-
-/* Helper functions */
-
-bool checkreturn pb_encbuf_varint(pb_strstream_t *stream, uint64_t value)
-{
-    if (stream->last == stream->buffer)
-    {
-        return false;
-    }
-    else if (value < 128)
-    {
-        *--stream->last = value;
-        return true;
-    }
-    else
-    {
-        uint8_t buffer[10];
-        int i = 0;
-
-        while (value)
-        {
-            buffer[i] = (value & 0x7F) | 0x80;
-            value >>= 7;
-            i++;
-        }
-        buffer[i-1] &= 0x7F;
-        return pb_buf_write(stream, buffer, i);
-    }
-}
-
-bool checkreturn pb_encbuf_tag(pb_strstream_t *stream, pb_wire_type_t wiretype, int field_number)
-{
-    int tag = wiretype | (field_number << 3);
-    return pb_encbuf_varint(stream, tag);
-}
-
-bool checkreturn pb_encbuf_tag_for_field(pb_strstream_t *stream, const pb_field_t *field)
-{
-    pb_wire_type_t wiretype;
-    switch (PB_LTYPE(field->type))
-    {
-        case PB_LTYPE_VARINT:
-        case PB_LTYPE_SVARINT:
-            wiretype = PB_WT_VARINT;
-            break;
-        
-        case PB_LTYPE_FIXED32:
-            wiretype = PB_WT_32BIT;
-            break;
-        
-        case PB_LTYPE_FIXED64:
-            wiretype = PB_WT_64BIT;
-            break;
-        
-        case PB_LTYPE_BYTES:
-        case PB_LTYPE_STRING:
-        case PB_LTYPE_SUBMESSAGE:
-            wiretype = PB_WT_STRING;
-            break;
-        
-        default:
-            return false;
-    }
-    
-    return pb_encbuf_tag(stream, wiretype, field->tag);
-}
-
-bool checkreturn pb_encbuf_string(pb_strstream_t *stream, const uint8_t *buffer, size_t size)
-{
-    if (!pb_buf_write(stream, buffer, size))
-        return false;
-    return pb_encbuf_varint(stream, size);
-}
-
-/* Field encoders */
-
-/* Copy srcsize bytes of integer from src so that values are casted properly.
- * On little endian machine, copy to start of dest
- * On big endian machine, copy to end of dest
- * destsize must always be larger than srcsize
- * 
- * Note: This is the reverse of the endian_copy in pb_decode.c.
- */
-static void endian_copy(uint64_t *dest, const void *src, size_t srcsize)
-{
-#ifdef __BIG_ENDIAN__
-    memcpy((char*)dest + sizeof(*dest) - srcsize, src, srcsize);
-#else
-    memcpy(dest, src, srcsize);
-#endif
-}
-
-static bool pb_encb_varint(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-    uint64_t value = 0;
-    endian_copy(&value, src, field->data_size);
-    return pb_encbuf_varint(stream, value);
-}
-
-static bool pb_encb_svarint(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-    uint64_t value = 0;
-    uint64_t zigzagged;
-    uint64_t signbitmask = (uint64_t)0x80 << (field->data_size * 8 - 8);
-    uint64_t xormask = ((uint64_t)-1) >> (64 - field->data_size * 8);
-    
-    endian_copy(&value, src, field->data_size);
-    if (value & signbitmask)
-        zigzagged = ((value ^ xormask) << 1) | 1;
-    else
-        zigzagged = value << 1;
-    
-    return pb_encbuf_varint(stream, zigzagged);
-}
-
-static bool pb_encb_fixed32(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-#ifdef __BIG_ENDIAN__
-    const uint8_t *bytes = (const uint8_t*)src;
-    uint8_t lebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]};
-    src = lebytes;
-#endif
-    return pb_buf_write(stream, src, 4);
-}
-
-static bool pb_encb_fixed64(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-#ifdef __BIG_ENDIAN__
-    const uint8_t *bytes = (const uint8_t*)src;
-    uint8_t lebytes[8] = {bytes[7], bytes[6], bytes[5], bytes[4],
-                          bytes[3], bytes[2], bytes[1], bytes[0]};
-    src = lebytes;
-#endif
-    return pb_buf_write(stream, src, 8);
-}
-
-static bool pb_encb_bytes(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-    if ((field != NULL) && PB_POINTER(field->type)) {
-        pb_bytes_t *bytes = (pb_bytes_t*)src;
-        return pb_encbuf_string(stream, bytes->bytes, bytes->size);
-    } else {
-        pb_bytes_array_t *bytes = (pb_bytes_array_t*)src;
-        return pb_encbuf_string(stream, bytes->bytes, bytes->size);
-    }
-}
-
-static bool pb_encb_string(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-    size_t len;
-    if ((field != NULL) && PB_POINTER(field->type))
-        src = *(char**)src;
-    len = src ? strlen((char*)src) : 0;
-    return pb_encbuf_string(stream, (uint8_t*)src, len);
-}
-
-static bool pb_encb_submessage(pb_strstream_t *stream, const pb_field_t *field, const void *src)
-{
-    uint8_t *start;
-    size_t size;
-    
-    if (field->ptr == NULL)
-        return false;
-    
-    if (PB_POINTER(field->type)) {
-        src = *(void**)src;
-        if (src == NULL)
-            return false;
-    }
-    
-    start = stream->last;
-    if (!pb_encode_buffer(stream, (const pb_message_t*)field->ptr, src))
-        return false;
-    
-    size = start - stream->last;
-    if (!pb_encbuf_varint(stream, size))
-        return false;
-    
-    return true;
-}

pb_encode_buffer.h

@@ -1,43 +0,0 @@
-#ifndef _PB_ENCODE_BUFFER_H_
-#define _PB_ENCODE_BUFFER_H_
-
-/* pb_encode_buffer.h: Functions to encode protocol buffers to an
- * in-memory array of bytes. Depends on pb_encode_buffer.c. The main
- * function is pb_encode_buffer.  You also need an output buffer,
- * structures and their field descriptions (just like with pb_decode
- * or pb_encode).
- */
-
-#include <stdbool.h>
-#include "pb.h"
-
-/* Output stream for an in-memory buffer.
- */
-struct _pb_strstream_t
-{
-    uint8_t *buffer;
-    uint8_t *last;
-};
-
-pb_strstream_t pb_strstream_from_buffer(uint8_t *buf, size_t bufsize);
-bool pb_buf_write(pb_strstream_t *stream, const uint8_t *buf, size_t count);
-
-/* --- Helper functions ---
- * You may want to use these from your caller or callbacks.
- */
-
-bool pb_encbuf_varint(pb_strstream_t *stream, uint64_t value);
-bool pb_encbuf_tag(pb_strstream_t *stream, pb_wire_type_t wiretype, int field_number);
-/* Encode tag based on LTYPE and field number defined in the field structure. */
-bool pb_encbuf_tag_for_field(pb_strstream_t *stream, const pb_field_t *field);
-/* Write length as varint and then the contents of buffer. */
-bool pb_encbuf_string(pb_strstream_t *stream, const uint8_t *buffer, size_t size);
-
-/* Encode struct to given output stream.
- * Returns true on success, false on any failure.
- * The actual struct pointed to by src_struct must match the description in msg.
- * All required fields in the struct are assumed to have been filled in.
- */
-bool pb_encode_buffer(pb_strstream_t *stream, const pb_message_t *msg, const void *src_struct);
-
-#endif

tests/Makefile

@@ -1,38 +1,62 @@
-CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage
-LDFLAGS=--coverage
-DEPS=../pb_decode.h ../pb_encode.h ../pb_encode_buffer.h ../pb.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h
-TESTS=test_decode1 test_encode1 test_decode_callbacks test_encode_callbacks decode_unittests decode_ptr_unittests encode_unittests
+CFLAGS=-ansi -Wall -Werror -I .. -g -O0
+DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h \
+	callbacks2.pb.h callbacks.pb.h unittests.h unittestproto.pb.h \
+	alltypes.pb.h missing_fields.pb.h
+TESTS=  decode_unittests encode_unittests \
+	test_decode1 test_decode2 test_decode3 \
+	test_encode1 test_encode2 test_encode3 \
+	test_decode_callbacks test_encode_callbacks \
+	test_missing_fields test_no_messages \
+	test_multiple_files test_cxxcompile test_options
+
+# More strict checks for the core part of nanopb
+CC_VERSION=$(shell $(CC) -v 2>&1)
+CFLAGS_CORE=
+ifneq (,$(findstring gcc,$(CC_VERSION)))
+	CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wlogical-op -Wconversion
+        CFLAGS+=--coverage
+        LDFLAGS+=--coverage
+endif
+ifneq (,$(findstring clang,$(CC_VERSION)))
+	CFLAGS_CORE=-pedantic -Wextra -Wcast-qual -Wconversion
+endif
 
 all: breakpoints $(TESTS) run_unittests
 
 clean:
-	rm -f $(TESTS) *.pb.c *.pb.h *.o *.gcda *.gcno
+	rm -f $(TESTS) person.pb* alltypes.pb* *.o *.gcda *.gcno *.pb.h *.pb.c
+
+%.pb.o: %.pb.c %.pb.h
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
 
 %.o: %.c
 %.o: %.c $(DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 pb_encode.o: ../pb_encode.c $(DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
-pb_encode_buffer.o: ../pb_encode_buffer.c $(DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
 pb_decode.o: ../pb_decode.c $(DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
-pb_ptr_decode.o: ../pb_decode.c $(DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
-decode_ptr_unittests.o: decode_unittests.c $(DEPS)
-	$(CC) $(CFLAGS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
 
+pb_encode.cxx.o: ../pb_encode.c $(DEPS)
+	$(CXX) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+pb_decode.cxx.o: ../pb_decode.c $(DEPS)
+	$(CXX) $(CFLAGS) $(CFLAGS_CORE) -c -o $@ $<
+
+test_cxxcompile: pb_encode.cxx.o pb_decode.cxx.o
 test_decode1: test_decode1.o pb_decode.o person.pb.o
 test_decode2: test_decode2.o pb_decode.o person.pb.o
+test_decode3: test_decode3.o pb_decode.o alltypes.pb.o
 test_encode1: test_encode1.o pb_encode.o person.pb.o
 test_encode2: test_encode2.o pb_encode.o person.pb.o
+test_encode3: test_encode3.o pb_encode.o alltypes.pb.o
+test_multiple_files: test_multiple_files.o pb_encode.o callbacks2.pb.o callbacks.pb.o
 test_decode_callbacks: test_decode_callbacks.o pb_decode.o callbacks.pb.o
 test_encode_callbacks: test_encode_callbacks.o pb_encode.o callbacks.pb.o
+test_missing_fields: test_missing_fields.o pb_encode.o pb_decode.o missing_fields.pb.o
 decode_unittests: decode_unittests.o pb_decode.o unittestproto.pb.o
-pb_ptr_decode.o decode_ptr_unittests.o: CFLAGS += -DMALLOC_HEADER="<stdlib.h>"
-decode_ptr_unittests: decode_ptr_unittests.o pb_ptr_decode.o unittestproto.pb.o
-encode_unittests: encode_unittests.o pb_encode.o pb_encode_buffer.o unittestproto.pb.o
+encode_unittests: encode_unittests.o pb_encode.o unittestproto.pb.o
+test_no_messages: no_messages.pb.h no_messages.pb.c no_messages.pb.o
 
 %.pb: %.proto
 	protoc -I. -I../generator -I/usr/include -o$@ $<
@@ -45,15 +69,12 @@ breakpoints: ../*.c *.c
 
 coverage: run_unittests
 	gcov pb_encode.gcda
-	gcov pb_encode_buffer.gcda
 	gcov pb_decode.gcda
-	gcov pb_ptr_decode.gcda
 
-run_unittests: decode_unittests decode_ptr_unittests encode_unittests test_encode1 test_encode2 test_decode1 test_decode2 test_encode_callbacks test_decode_callbacks
+run_unittests: $(TESTS)
 	rm -f *.gcda
 	
 	./decode_unittests > /dev/null
-	./decode_ptr_unittests > /dev/null
 	./encode_unittests > /dev/null
 	
 	[ "`./test_encode1 | ./test_decode1`" = \
@@ -65,8 +86,25 @@ run_unittests: decode_unittests decode_ptr_unittests encode_unittests test_encod
 	[ "`./test_encode2 | ./test_decode2`" = \
 	"`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
 	
+	[ "`./test_decode2 < person_with_extra_field.pb`" = \
+	"`./test_encode2 | ./test_decode2`" ]
+	
 	[ "`./test_encode_callbacks | ./test_decode_callbacks`" = \
 	"`./test_encode_callbacks | protoc --decode=TestMessage callbacks.proto`" ]
 
+	./test_encode3 | ./test_decode3
+	./test_encode3 1 | ./test_decode3 1
+	./test_encode3 1 | protoc --decode=AllTypes -I. -I../generator -I/usr/include alltypes.proto >/dev/null
+	
+	./test_missing_fields
+
+test_options: options.pb.h options.expected options.pb.o
+	cat options.expected | while read -r p; do \
+	    if ! grep -q "$$p" $<; then \
+	        echo Expected: "$$p"; \
+	        exit 1; \
+	    fi \
+	done
+
 run_fuzztest: test_decode2
 	bash -c 'I=1; while true; do cat /dev/urandom | ./test_decode2 > /dev/null; I=$$(($$I+1)); echo -en "\r$$I"; done'

tests/alltypes.proto

@@ -0,0 +1,85 @@
+import "nanopb.proto";
+
+message SubMessage {
+    required string substuff1 = 1 [(nanopb).max_size = 16, default = "1"];
+    required int32 substuff2 = 2 [default = 2];
+    optional fixed32 substuff3 = 3 [default = 3];
+}
+
+enum MyEnum {
+    Zero = 0;
+    First = 1;
+    Second = 2;
+    Truth = 42;
+}
+
+message AllTypes {
+    required int32      req_int32   = 1;
+    required int64      req_int64   = 2;
+    required uint32     req_uint32  = 3;
+    required uint64     req_uint64  = 4;
+    required sint32     req_sint32  = 5;
+    required sint64     req_sint64  = 6;
+    required bool       req_bool    = 7;
+    
+    required fixed32    req_fixed32 = 8;
+    required sfixed32   req_sfixed32= 9;
+    required float      req_float   = 10;
+    
+    required fixed64    req_fixed64 = 11;
+    required sfixed64   req_sfixed64= 12;
+    required double     req_double  = 13;
+    
+    required string     req_string  = 14 [(nanopb).max_size = 16];
+    required bytes      req_bytes   = 15 [(nanopb).max_size = 16];
+    required SubMessage req_submsg  = 16;
+    required MyEnum     req_enum    = 17;
+    
+    
+    repeated int32      rep_int32   = 21 [(nanopb).max_count = 5];
+    repeated int64      rep_int64   = 22 [(nanopb).max_count = 5];
+    repeated uint32     rep_uint32  = 23 [(nanopb).max_count = 5];
+    repeated uint64     rep_uint64  = 24 [(nanopb).max_count = 5];
+    repeated sint32     rep_sint32  = 25 [(nanopb).max_count = 5];
+    repeated sint64     rep_sint64  = 26 [(nanopb).max_count = 5];
+    repeated bool       rep_bool    = 27 [(nanopb).max_count = 5];
+    
+    repeated fixed32    rep_fixed32 = 28 [(nanopb).max_count = 5];
+    repeated sfixed32   rep_sfixed32= 29 [(nanopb).max_count = 5];
+    repeated float      rep_float   = 30 [(nanopb).max_count = 5];
+    
+    repeated fixed64    rep_fixed64 = 31 [(nanopb).max_count = 5];
+    repeated sfixed64   rep_sfixed64= 32 [(nanopb).max_count = 5];
+    repeated double     rep_double  = 33 [(nanopb).max_count = 5];
+    
+    repeated string     rep_string  = 34 [(nanopb).max_size = 16, (nanopb).max_count = 5];
+    repeated bytes      rep_bytes   = 35 [(nanopb).max_size = 16, (nanopb).max_count = 5];
+    repeated SubMessage rep_submsg  = 36 [(nanopb).max_count = 5];
+    repeated MyEnum     rep_enum    = 37 [(nanopb).max_count = 5];
+    
+    optional int32      opt_int32   = 41 [default = 4041];
+    optional int64      opt_int64   = 42 [default = 4042];
+    optional uint32     opt_uint32  = 43 [default = 4043];
+    optional uint64     opt_uint64  = 44 [default = 4044];
+    optional sint32     opt_sint32  = 45 [default = 4045];
+    optional sint64     opt_sint64  = 46 [default = 4046];
+    optional bool       opt_bool    = 47 [default = false];
+    
+    optional fixed32    opt_fixed32 = 48 [default = 4048];
+    optional sfixed32   opt_sfixed32= 49 [default = 4049];
+    optional float      opt_float   = 50 [default = 4050];
+    
+    optional fixed64    opt_fixed64 = 51 [default = 4051];
+    optional sfixed64   opt_sfixed64= 52 [default = 4052];
+    optional double     opt_double  = 53 [default = 4053];
+    
+    optional string     opt_string  = 54 [(nanopb).max_size = 16, default = "4054"];
+    optional bytes      opt_bytes   = 55 [(nanopb).max_size = 16, default = "4055"];
+    optional SubMessage opt_submsg  = 56;
+    optional MyEnum     opt_enum    = 57 [default = Second];
+
+    // Just to make sure that the size of the fields has been calculated
+    // properly, i.e. otherwise a bug in last field might not be detected.
+    required int32      end = 99;
+}
+

tests/callbacks2.proto

@@ -0,0 +1,9 @@
+// Test if including generated header file for this file + implicit include of
+// callbacks.pb.h still compiles. Used with test_compiles.c.
+import "callbacks.proto";
+
+message Callback2Message {
+    required TestMessage tstmsg = 1;
+    required SubMessage submsg = 2;
+}
+

tests/decode_unittests.c

@@ -1,3 +1,5 @@
+#define NANOPB_INTERNALS
+
 #include <stdio.h>
 #include <string.h>
 #include "pb_decode.h"
@@ -167,14 +169,22 @@ int main()
     {
         pb_istream_t s;
         struct { size_t size; uint8_t bytes[5]; } d;
-        pb_field_t f = {1, PB_LTYPE_BYTES, 0, 0, 5, 0, 0};
+        pb_field_t f = {1, PB_LTYPE_BYTES, 0, 0, sizeof(d), 0, 0};
         
         COMMENT("Test pb_dec_bytes")
         TEST((s = S("\x00"), pb_dec_bytes(&s, &f, &d) && d.size == 0))
         TEST((s = S("\x01\xFF"), pb_dec_bytes(&s, &f, &d) && d.size == 1 && d.bytes[0] == 0xFF))
-        TEST((s = S("\x06xxxxxx"), !pb_dec_bytes(&s, &f, &d)))
         TEST((s = S("\x05xxxxx"), pb_dec_bytes(&s, &f, &d) && d.size == 5))
         TEST((s = S("\x05xxxx"), !pb_dec_bytes(&s, &f, &d)))
+        
+        /* Note: the size limit on bytes-fields is not strictly obeyed, as
+         * the compiler may add some padding to the struct. Using this padding
+         * is not a very good thing to do, but it is difficult to avoid when
+         * we use only a single uint8_t to store the size of the field.
+         * Therefore this tests against a 10-byte string, while otherwise even
+         * 6 bytes should error out.
+         */
+        TEST((s = S("\x10xxxxxxxxxx"), !pb_dec_bytes(&s, &f, &d)))
     }
     
     {
@@ -193,13 +203,13 @@ int main()
         IntegerArray dest;
         
         COMMENT("Testing pb_decode with repeated int32 field")
-        TEST((s = S(""), pb_decode(&s, IntegerArray_msg, &dest) && dest.data_count == 0))
-        TEST((s = S("\x08\x01\x08\x02"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S(""), pb_decode(&s, IntegerArray_fields, &dest) && dest.data_count == 0))
+        TEST((s = S("\x08\x01\x08\x02"), pb_decode(&s, IntegerArray_fields, &dest)
              && dest.data_count == 2 && dest.data[0] == 1 && dest.data[1] == 2))
         s = S("\x08\x01\x08\x02\x08\x03\x08\x04\x08\x05\x08\x06\x08\x07\x08\x08\x08\x09\x08\x0A");
-        TEST(pb_decode(&s, IntegerArray_msg, &dest) && dest.data_count == 10 && dest.data[9] == 10)
+        TEST(pb_decode(&s, IntegerArray_fields, &dest) && dest.data_count == 10 && dest.data[9] == 10)
         s = S("\x08\x01\x08\x02\x08\x03\x08\x04\x08\x05\x08\x06\x08\x07\x08\x08\x08\x09\x08\x0A\x08\x0B");
-        TEST(!pb_decode(&s, IntegerArray_msg, &dest))
+        TEST(!pb_decode(&s, IntegerArray_fields, &dest))
     }
     
     {
@@ -207,17 +217,17 @@ int main()
         IntegerArray dest;
         
         COMMENT("Testing pb_decode with packed int32 field")
-        TEST((s = S("\x0A\x00"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x0A\x00"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 0))
-        TEST((s = S("\x0A\x01\x01"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x0A\x01\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
-        TEST((s = S("\x0A\x0A\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x0A\x0A\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 10 && dest.data[0] == 1 && dest.data[9] == 10))
-        TEST((s = S("\x0A\x0B\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"), !pb_decode(&s, IntegerArray_msg, &dest)))
+        TEST((s = S("\x0A\x0B\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B"), !pb_decode(&s, IntegerArray_fields, &dest)))
         
         /* Test invalid wire data */
-        TEST((s = S("\x0A\xFF"), !pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x0A\x01"), !pb_decode(&s, IntegerArray_msg, &dest)))
+        TEST((s = S("\x0A\xFF"), !pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x0A\x01"), !pb_decode(&s, IntegerArray_fields, &dest)))
     }
     
     {
@@ -225,14 +235,14 @@ int main()
         IntegerArray dest;
         
         COMMENT("Testing pb_decode with unknown fields")
-        TEST((s = S("\x18\x0F\x08\x01"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x18\x0F\x08\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
-        TEST((s = S("\x19\x00\x00\x00\x00\x00\x00\x00\x00\x08\x01"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x19\x00\x00\x00\x00\x00\x00\x00\x00\x08\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
-        TEST((s = S("\x1A\x00\x08\x01"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x1A\x00\x08\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
-        TEST((s = S("\x1B\x08\x01"), !pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x1D\x00\x00\x00\x00\x08\x01"), pb_decode(&s, IntegerArray_msg, &dest)
+        TEST((s = S("\x1B\x08\x01"), !pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x1D\x00\x00\x00\x00\x08\x01"), pb_decode(&s, IntegerArray_fields, &dest)
             && dest.data_count == 1 && dest.data[0] == 1))
     }
     
@@ -246,25 +256,25 @@ int main()
         COMMENT("Testing pb_decode with callbacks")
         /* Single varint */
         ref.size = 1; ref.bytes[0] = 0x55;
-        TEST((s = S("\x08\x55"), pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x08\x55"), pb_decode(&s, CallbackArray_fields, &dest)))
         /* Packed varint */
         ref.size = 3; ref.bytes[0] = ref.bytes[1] = ref.bytes[2] = 0x55;
-        TEST((s = S("\x0A\x03\x55\x55\x55"), pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x0A\x03\x55\x55\x55"), pb_decode(&s, CallbackArray_fields, &dest)))
         /* Packed varint with loop */
         ref.size = 1; ref.bytes[0] = 0x55;
-        TEST((s = S("\x0A\x03\x55\x55\x55"), pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x0A\x03\x55\x55\x55"), pb_decode(&s, CallbackArray_fields, &dest)))
         /* Single fixed32 */
         ref.size = 4; ref.bytes[0] = ref.bytes[1] = ref.bytes[2] = ref.bytes[3] = 0xAA;
-        TEST((s = S("\x0D\xAA\xAA\xAA\xAA"), pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x0D\xAA\xAA\xAA\xAA"), pb_decode(&s, CallbackArray_fields, &dest)))
         /* Single fixed64 */
         ref.size = 8; memset(ref.bytes, 0xAA, 8);
-        TEST((s = S("\x09\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"), pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x09\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"), pb_decode(&s, CallbackArray_fields, &dest)))
         /* Unsupported field type */
-        TEST((s = S("\x0B\x00"), !pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x0B\x00"), !pb_decode(&s, CallbackArray_fields, &dest)))
         
         /* Just make sure that our test function works */
         ref.size = 1; ref.bytes[0] = 0x56;
-        TEST((s = S("\x08\x55"), !pb_decode(&s, CallbackArray_msg, &dest)))
+        TEST((s = S("\x08\x55"), !pb_decode(&s, CallbackArray_fields, &dest)))
     }
     
     {
@@ -272,39 +282,11 @@ int main()
         IntegerArray dest;
         
         COMMENT("Testing pb_decode message termination")
-        TEST((s = S(""), pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x00"), pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x08\x01"), pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x08\x01\x00"), pb_decode(&s, IntegerArray_msg, &dest)))
-        TEST((s = S("\x08"), !pb_decode(&s, IntegerArray_msg, &dest)))
-    }
-    
-    {
-        pb_istream_t s;
-        PointerContainer dest;
-        
-        COMMENT("Testing pb_decode with pointer fields")
-        
-        memset(&dest, 0, sizeof(dest));
-#ifdef MALLOC_HEADER
-        TEST((s = S("\x0A\x01\x61\x12\x01\x62\x1A\x00\x2A\x01\x65\x32\x01\x66"
-                  "\x3A\x00\x42\x01\x63\x4A\x01\x64"),
-              pb_decode(&s, PointerContainer_msg, &dest)))
-        TEST(0 == strcmp(dest.text, "a"))
-        TEST(dest.blob.size == 1 && dest.blob.bytes[0] == 'b')
-        TEST(dest.submsg != NULL && dest.submsg->data == 10)
-        TEST(dest.rtext_count == 1 && (0 == strcmp(dest.rtext[0], "e")))
-        TEST(dest.rblob_count == 1 && dest.rblob[0].size == 1 &&
-             dest.rblob[0].bytes[0] == 'f')
-        TEST(dest.rsubmsg_count == 1)
-        TEST(0 == strcmp(dest.otext, "c"))
-        TEST(dest.oblob.size == 1 && dest.oblob.bytes[0] == 'd')
-        TEST(pb_clean(PointerContainer_msg, &dest));
-#else
-        TEST((s = S("\x0A\x01\x61\x12\x01\x62\x2A\x01\x65\x32\x01\x66\x01\x66"
-                  "\x3A\x00\x42\x01\x63\x4A\x01\x64"),
-              !pb_decode(&s, PointerContainer_msg, &dest)))
-#endif
+        TEST((s = S(""), pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x00"), pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x08\x01"), pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x08\x01\x00"), pb_decode(&s, IntegerArray_fields, &dest)))
+        TEST((s = S("\x08"), !pb_decode(&s, IntegerArray_fields, &dest)))
     }
     
     if (status != 0)

tests/encode_unittests.c

@@ -1,7 +1,8 @@
+#define NANOPB_INTERNALS
+
 #include <stdio.h>
 #include <string.h>
 #include "pb_encode.h"
-#include "pb_encode_buffer.h"
 #include "unittests.h"
 #include "unittestproto.pb.h"
 
@@ -24,14 +25,6 @@ bool fieldcallback(pb_ostream_t *stream, const pb_field_t *field, const void *ar
     return pb_encode_varint(stream, value);
 }
 
-bool fieldcallback_buf(pb_strstream_t *stream, const pb_field_t *field, const void *arg)
-{
-    int value = 0x55;
-    if (!pb_encbuf_varint(stream, value))
-        return false;
-    return pb_encbuf_tag_for_field(stream, field);
-}
-
 bool crazyfieldcallback(pb_ostream_t *stream, const pb_field_t *field, const void *arg)
 {
     /* This callback writes different amount of data the second time. */
@@ -42,16 +35,6 @@ bool crazyfieldcallback(pb_ostream_t *stream, const pb_field_t *field, const voi
     return pb_encode_varint(stream, *state);
 }
 
-bool crazyfieldcallback_buf(pb_strstream_t *stream, const pb_field_t *field, const void *arg)
-{
-    /* This callback writes different amount of data the second time. */
-    uint32_t *state = (uint32_t*)arg;
-    *state <<= 8;
-    if (!pb_encbuf_varint(stream, *state))
-        return false;
-    return pb_encbuf_tag_for_field(stream, field);
-}
-
 /* Check that expression x writes data y.
  * Y is a string, which may contain null bytes. Null terminator is ignored.
  */
@@ -62,20 +45,6 @@ s = pb_ostream_from_buffer(buffer, sizeof(buffer)), \
 memcmp(buffer, y, sizeof(y) - 1) == 0 && \
 buffer[sizeof(y) - 1] == 0xAA
 
-/* Check that expression x writes data y into s2.
- * Y is a string, which may contain null bytes. Null terminator is ignored.
- */
-#define WRITES_BUF(x, y) \
-memset(buffer, 0xAA, sizeof(buffer)), \
-s2 = pb_strstream_from_buffer(buffer, sizeof(buffer)), \
-(x) && \
-memcmp(s2.last, y, sizeof(y) - 1) == 0 && \
-s2.last - buffer == sizeof(buffer) - (sizeof(y) - 1)
-
-/* Check that expression x and y write data z into s and s2, respectively.
- */
-#define WRITES_BOTH(x, y, z) (WRITES(x, z)) && (WRITES_BUF(y, z))
-
 int main()
 {
     int status = 0;
@@ -105,81 +74,57 @@ int main()
     {
         uint8_t buffer[30];
         pb_ostream_t s;
-        pb_strstream_t s2;
         
         COMMENT("Test pb_encode_varint")
-        TEST(WRITES_BOTH(pb_encode_varint(&s, 0),
-                         pb_encbuf_varint(&s2, 0), "\0"));
-        TEST(WRITES_BOTH(pb_encode_varint(&s, 1),
-                         pb_encbuf_varint(&s2, 1), "\1"));
-        TEST(WRITES_BOTH(pb_encode_varint(&s, 0x7F),
-                         pb_encbuf_varint(&s2, 0x7F), "\x7F"));
-        TEST(WRITES_BOTH(pb_encode_varint(&s, 0x80),
-                         pb_encbuf_varint(&s2, 0x80), "\x80\x01"));
-        TEST(WRITES_BOTH(pb_encode_varint(&s, UINT32_MAX),
-                         pb_encbuf_varint(&s2, UINT32_MAX),
-                         "\xFF\xFF\xFF\xFF\x0F"));
-        TEST(WRITES_BOTH(pb_encode_varint(&s, UINT64_MAX),
-                         pb_encbuf_varint(&s2, UINT64_MAX),
-                         "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01"));
+        TEST(WRITES(pb_encode_varint(&s, 0), "\0"));
+        TEST(WRITES(pb_encode_varint(&s, 1), "\1"));
+        TEST(WRITES(pb_encode_varint(&s, 0x7F), "\x7F"));
+        TEST(WRITES(pb_encode_varint(&s, 0x80), "\x80\x01"));
+        TEST(WRITES(pb_encode_varint(&s, UINT32_MAX), "\xFF\xFF\xFF\xFF\x0F"));
+        TEST(WRITES(pb_encode_varint(&s, UINT64_MAX), "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x01"));
     }
     
     {
         uint8_t buffer[30];
         pb_ostream_t s;
-        pb_strstream_t s2;
         
         COMMENT("Test pb_encode_tag")
-        TEST(WRITES_BOTH(pb_encode_tag(&s, PB_WT_STRING, 5),
-                         pb_encbuf_tag(&s2, PB_WT_STRING, 5), "\x2A"));
-        TEST(WRITES_BOTH(pb_encode_tag(&s, PB_WT_VARINT, 99),
-                         pb_encbuf_tag(&s2, PB_WT_VARINT, 99), "\x98\x06"));
+        TEST(WRITES(pb_encode_tag(&s, PB_WT_STRING, 5), "\x2A"));
+        TEST(WRITES(pb_encode_tag(&s, PB_WT_VARINT, 99), "\x98\x06"));
     }
     
     {
         uint8_t buffer[30];
         pb_ostream_t s;
-        pb_strstream_t s2;
         pb_field_t field = {10, PB_LTYPE_SVARINT};
         
         COMMENT("Test pb_encode_tag_for_field")
-        TEST(WRITES_BOTH(pb_encode_tag_for_field(&s, &field),
-                         pb_encbuf_tag_for_field(&s2, &field), "\x50"));
+        TEST(WRITES(pb_encode_tag_for_field(&s, &field), "\x50"));
         
         field.type = PB_LTYPE_FIXED64;
-        TEST(WRITES_BOTH(pb_encode_tag_for_field(&s, &field),
-                         pb_encbuf_tag_for_field(&s2, &field), "\x51"));
+        TEST(WRITES(pb_encode_tag_for_field(&s, &field), "\x51"));
         
         field.type = PB_LTYPE_STRING;
-        TEST(WRITES_BOTH(pb_encode_tag_for_field(&s, &field),
-                         pb_encbuf_tag_for_field(&s2, &field), "\x52"));
+        TEST(WRITES(pb_encode_tag_for_field(&s, &field), "\x52"));
         
         field.type = PB_LTYPE_FIXED32;
-        TEST(WRITES_BOTH(pb_encode_tag_for_field(&s, &field),
-                         pb_encbuf_tag_for_field(&s2, &field), "\x55"));
+        TEST(WRITES(pb_encode_tag_for_field(&s, &field), "\x55"));
     }
     
     {
         uint8_t buffer[30];
         pb_ostream_t s;
-        pb_strstream_t s2;
         
         COMMENT("Test pb_encode_string")
-        TEST(WRITES_BOTH(pb_encode_string(&s, (const uint8_t*)"abcd", 4),
-                         pb_encbuf_string(&s2, (const uint8_t*)"abcd", 4),
-                         "\x04""abcd"));
-        TEST(WRITES_BOTH(pb_encode_string(&s, (const uint8_t*)"abcd\x00", 5),
-                         pb_encbuf_string(&s2, (const uint8_t*)"abcd\x00", 5),
-                         "\x05""abcd\x00"));
-        TEST(WRITES_BOTH(pb_encode_string(&s, (const uint8_t*)"", 0),
-                         pb_encbuf_string(&s2, (const uint8_t*)"", 0), "\x00"));
+        TEST(WRITES(pb_encode_string(&s, (const uint8_t*)"abcd", 4), "\x04""abcd"));
+        TEST(WRITES(pb_encode_string(&s, (const uint8_t*)"abcd\x00", 5), "\x05""abcd\x00"));
+        TEST(WRITES(pb_encode_string(&s, (const uint8_t*)"", 0), "\x00"));
     }
     
     {
         uint8_t buffer[30];
         pb_ostream_t s;
         uint8_t value = 1;
-        int8_t svalue = -1;
         int32_t max = INT32_MAX;
         int32_t min = INT32_MIN;
         int64_t lmax = INT64_MAX;
@@ -188,8 +133,6 @@ int main()
         
         COMMENT("Test pb_enc_varint and pb_enc_svarint")
         TEST(WRITES(pb_enc_varint(&s, &field, &value), "\x01"));
-        TEST(WRITES(pb_enc_svarint(&s, &field, &svalue), "\x01"));
-        TEST(WRITES(pb_enc_svarint(&s, &field, &value), "\x02"));
         
         field.data_size = sizeof(max);
         TEST(WRITES(pb_enc_svarint(&s, &field, &max), "\xfe\xff\xff\xff\x0f"));
@@ -248,90 +191,71 @@ int main()
     {
         uint8_t buffer[10];
         pb_ostream_t s;
-        pb_strstream_t s2;
-        IntegerArray msg = {{0}, 5, {1, 2, 3, 4, 5}};
+        IntegerArray msg = {5, {1, 2, 3, 4, 5}};
         
         COMMENT("Test pb_encode with int32 array")
         
-        TEST(WRITES_BOTH(pb_encode(&s, IntegerArray_msg, &msg),
-                         pb_encode_buffer(&s2, IntegerArray_msg, &msg),
-                         "\x0A\x05\x01\x02\x03\x04\x05"))
+        TEST(WRITES(pb_encode(&s, IntegerArray_fields, &msg), "\x0A\x05\x01\x02\x03\x04\x05"))
         
         msg.data_count = 0;
-        TEST(WRITES_BOTH(pb_encode(&s, IntegerArray_msg, &msg),
-                         pb_encode_buffer(&s2, IntegerArray_msg, &msg), ""))
+        TEST(WRITES(pb_encode(&s, IntegerArray_fields, &msg), ""))
         
         msg.data_count = 10;
-        TEST(!pb_encode(&s, IntegerArray_msg, &msg))
-        TEST(!pb_encode_buffer(&s2, IntegerArray_msg, &msg))
+        TEST(!pb_encode(&s, IntegerArray_fields, &msg))
     }
     
     {
         uint8_t buffer[10];
         pb_ostream_t s;
-        pb_strstream_t s2;
-        FloatArray msg = {{0}, 1, {99.0f}};
+        FloatArray msg = {1, {99.0f}};
         
         COMMENT("Test pb_encode with float array")
         
-        TEST(WRITES_BOTH(pb_encode(&s, FloatArray_msg, &msg),
-                         pb_encode_buffer(&s2, FloatArray_msg, &msg),
-                         "\x0A\x04\x00\x00\xc6\x42"))
+        TEST(WRITES(pb_encode(&s, FloatArray_fields, &msg),
+                    "\x0A\x04\x00\x00\xc6\x42"))
         
         msg.data_count = 0;
-        TEST(WRITES_BOTH(pb_encode(&s, FloatArray_msg, &msg),
-                         pb_encode_buffer(&s2, FloatArray_msg, &msg), ""))
+        TEST(WRITES(pb_encode(&s, FloatArray_fields, &msg), ""))
         
         msg.data_count = 3;
-        TEST(!pb_encode(&s, FloatArray_msg, &msg))
-        TEST(!pb_encode_buffer(&s2, FloatArray_msg, &msg))
+        TEST(!pb_encode(&s, FloatArray_fields, &msg))
     }
     
     {
         uint8_t buffer[10];
         pb_ostream_t s;
-        pb_strstream_t s2;
         CallbackArray msg;
         
-        COMMENT("Test pb_encode with callback field.")
         msg.data.funcs.encode = &fieldcallback;
-        TEST(WRITES(pb_encode(&s, CallbackArray_msg, &msg), "\x08\x55"))
-        msg.data.funcs.encode_buffer = &fieldcallback_buf;
-        TEST(WRITES_BUF(pb_encode_buffer(&s2, CallbackArray_msg, &msg), "\x08\x55"))
+        
+        COMMENT("Test pb_encode with callback field.")
+        TEST(WRITES(pb_encode(&s, CallbackArray_fields, &msg), "\x08\x55"))
     }
     
     {
         uint8_t buffer[10];
         pb_ostream_t s;
-        pb_strstream_t s2;
-        IntegerContainer msg = {{0}, {{0}, 5, {1,2,3,4,5}}};
+        IntegerContainer msg = {{5, {1,2,3,4,5}}};
         
         COMMENT("Test pb_encode with packed array in a submessage.")
-        TEST(WRITES_BOTH(pb_encode(&s, IntegerContainer_msg, &msg),
-                         pb_encode_buffer(&s2, IntegerContainer_msg, &msg),
-                         "\x0A\x07\x0A\x05\x01\x02\x03\x04\x05"))
+        TEST(WRITES(pb_encode(&s, IntegerContainer_fields, &msg),
+                    "\x0A\x07\x0A\x05\x01\x02\x03\x04\x05"))
     }
     
     {
         uint8_t buffer[10];
         pb_ostream_t s;
-        pb_strstream_t s2;
         CallbackContainer msg;
         CallbackContainerContainer msg2;
         uint32_t state = 1;
         
-        COMMENT("Test pb_encode with callback field in a submessage.")
         msg.submsg.data.funcs.encode = &fieldcallback;
         msg2.submsg.submsg.data.funcs.encode = &fieldcallback;
-        TEST(WRITES(pb_encode(&s, CallbackContainer_msg, &msg), "\x0A\x02\x08\x55"))
-        TEST(WRITES(pb_encode(&s, CallbackContainerContainer_msg, &msg2),
-                    "\x0A\x04\x0A\x02\x08\x55"))
         
-        msg.submsg.data.funcs.encode_buffer = &fieldcallback_buf;
-        msg2.submsg.submsg.data.funcs.encode_buffer = &fieldcallback_buf;
-        TEST(WRITES_BUF(pb_encode_buffer(&s2, CallbackContainer_msg, &msg), "\x0A\x02\x08\x55"))
-        TEST(WRITES_BUF(pb_encode_buffer(&s2, CallbackContainerContainer_msg, &msg2),
-                        "\x0A\x04\x0A\x02\x08\x55"))
+        COMMENT("Test pb_encode with callback field in a submessage.")
+        TEST(WRITES(pb_encode(&s, CallbackContainer_fields, &msg), "\x0A\x02\x08\x55"))
+        TEST(WRITES(pb_encode(&s, CallbackContainerContainer_fields, &msg2),
+                    "\x0A\x04\x0A\x02\x08\x55"))
         
         /* Misbehaving callback: varying output between calls */
         msg.submsg.data.funcs.encode = &crazyfieldcallback;
@@ -339,63 +263,9 @@ int main()
         msg2.submsg.submsg.data.funcs.encode = &crazyfieldcallback;
         msg2.submsg.submsg.data.arg = &state;
         
-        TEST(!pb_encode(&s, CallbackContainer_msg, &msg))
+        TEST(!pb_encode(&s, CallbackContainer_fields, &msg))
         state = 1;
-        TEST(!pb_encode(&s, CallbackContainerContainer_msg, &msg2))
-
-        msg.submsg.data.funcs.encode_buffer = &crazyfieldcallback_buf;
-        msg.submsg.data.arg = &state;
-        msg2.submsg.submsg.data.funcs.encode_buffer = &crazyfieldcallback_buf;
-        msg2.submsg.submsg.data.arg = &state;
-        
-        TEST(!pb_encode_buffer(&s2, CallbackContainer_msg, &msg))
-        state = 1;
-        TEST(!pb_encode_buffer(&s2, CallbackContainerContainer_msg, &msg2))
-    }
-    
-    {
-        uint8_t buffer[30];
-        pb_ostream_t s;
-        pb_strstream_t s2;
-        PointerContainer msg;
-        DefaultContainer msg2;
-        IntegerArray msg3;
-        
-        COMMENT("Test pb_encode with pointer fields.")
-        
-        memset(&msg, 0, sizeof(msg));
-        memset(&msg2, 0, sizeof(msg2));
-        msg.text = "a";
-        msg.blob.size = 1;
-        msg.blob.bytes = (uint8_t*)"b";
-        msg.submsg = &msg2;
-        TEST(WRITES_BOTH(pb_encode(&s, PointerContainer_msg, &msg),
-                         pb_encode_buffer(&s2, PointerContainer_msg, &msg),
-                         "\x0A\x01\x61\x12\x01\x62\x1A\x00"))
-        
-        memset(&msg3, 0, sizeof(msg3));
-        msg.rtext_count = 1;
-        msg.rtext[0] = "e";
-        msg.rblob_count = 1;
-        msg.rblob[0].size = 1;
-        msg.rblob[0].bytes = (uint8_t*)"f";
-        msg.rsubmsg_count = 1;
-        msg.rsubmsg[0] = &msg3;
-        TEST(WRITES_BOTH(pb_encode(&s, PointerContainer_msg, &msg),
-                         pb_encode_buffer(&s2, PointerContainer_msg, &msg),
-                         "\x0A\x01\x61\x12\x01\x62\x1A\x00"
-                         "\x2A\x01\x65\x32\x01\x66\x3A\x00"));
-        
-        PointerContainer_set(msg, otext);
-        msg.otext = "c";
-        PointerContainer_set(msg, oblob);
-        msg.oblob.size = 1;
-        msg.oblob.bytes = (uint8_t*)"d";
-        TEST(WRITES_BOTH(pb_encode(&s, PointerContainer_msg, &msg),
-                         pb_encode_buffer(&s2, PointerContainer_msg, &msg),
-                         "\x0A\x01\x61\x12\x01\x62\x1A\x00"
-                         "\x2A\x01\x65\x32\x01\x66\x3A\x00"
-                         "\x42\x01\x63\x4A\x01\x64"));
+        TEST(!pb_encode(&s, CallbackContainerContainer_fields, &msg2))
     }
     
     if (status != 0)

tests/missing_fields.proto

@@ -0,0 +1,138 @@
+/* Test for one missing field among many */
+
+message AllFields
+{
+    required int32 field1 = 1;
+    required int32 field2 = 2;
+    required int32 field3 = 3;
+    required int32 field4 = 4;
+    required int32 field5 = 5;
+    required int32 field6 = 6;
+    required int32 field7 = 7;
+    required int32 field8 = 8;
+    required int32 field9 = 9;
+    required int32 field10 = 10;
+    required int32 field11 = 11;
+    required int32 field12 = 12;
+    required int32 field13 = 13;
+    required int32 field14 = 14;
+    required int32 field15 = 15;
+    required int32 field16 = 16;
+    required int32 field17 = 17;
+    required int32 field18 = 18;
+    required int32 field19 = 19;
+    required int32 field20 = 20;
+    required int32 field21 = 21;
+    required int32 field22 = 22;
+    required int32 field23 = 23;
+    required int32 field24 = 24;
+    required int32 field25 = 25;
+    required int32 field26 = 26;
+    required int32 field27 = 27;
+    required int32 field28 = 28;
+    required int32 field29 = 29;
+    required int32 field30 = 30;
+    required int32 field31 = 31;
+    required int32 field32 = 32;
+    required int32 field33 = 33;
+    required int32 field34 = 34;
+    required int32 field35 = 35;
+    required int32 field36 = 36;
+    required int32 field37 = 37;
+    required int32 field38 = 38;
+    required int32 field39 = 39;
+    required int32 field40 = 40;
+    required int32 field41 = 41;
+    required int32 field42 = 42;
+    required int32 field43 = 43;
+    required int32 field44 = 44;
+    required int32 field45 = 45;
+    required int32 field46 = 46;
+    required int32 field47 = 47;
+    required int32 field48 = 48;
+    required int32 field49 = 49;
+    required int32 field50 = 50;
+    required int32 field51 = 51;
+    required int32 field52 = 52;
+    required int32 field53 = 53;
+    required int32 field54 = 54;
+    required int32 field55 = 55;
+    required int32 field56 = 56;
+    required int32 field57 = 57;
+    required int32 field58 = 58;
+    required int32 field59 = 59;
+    required int32 field60 = 60;
+    required int32 field61 = 61;
+    required int32 field62 = 62;
+    required int32 field63 = 63;
+    required int32 field64 = 64;
+}
+
+message MissingField
+{
+    required int32 field1 = 1;
+    required int32 field2 = 2;
+    required int32 field3 = 3;
+    required int32 field4 = 4;
+    required int32 field5 = 5;
+    required int32 field6 = 6;
+    required int32 field7 = 7;
+    required int32 field8 = 8;
+    required int32 field9 = 9;
+    required int32 field10 = 10;
+    required int32 field11 = 11;
+    required int32 field12 = 12;
+    required int32 field13 = 13;
+    required int32 field14 = 14;
+    required int32 field15 = 15;
+    required int32 field16 = 16;
+    required int32 field17 = 17;
+    required int32 field18 = 18;
+    required int32 field19 = 19;
+    required int32 field20 = 20;
+    required int32 field21 = 21;
+    required int32 field22 = 22;
+    required int32 field23 = 23;
+    required int32 field24 = 24;
+    required int32 field25 = 25;
+    required int32 field26 = 26;
+    required int32 field27 = 27;
+    required int32 field28 = 28;
+    required int32 field29 = 29;
+    required int32 field30 = 30;
+    required int32 field31 = 31;
+    required int32 field32 = 32;
+    required int32 field33 = 33;
+    required int32 field34 = 34;
+    required int32 field35 = 35;
+    required int32 field36 = 36;
+    required int32 field37 = 37;
+    required int32 field38 = 38;
+    required int32 field39 = 39;
+    required int32 field40 = 40;
+    required int32 field41 = 41;
+    required int32 field42 = 42;
+    required int32 field43 = 43;
+    required int32 field44 = 44;
+    required int32 field45 = 45;
+    required int32 field46 = 46;
+    required int32 field47 = 47;
+    required int32 field48 = 48;
+    required int32 field49 = 49;
+    required int32 field50 = 50;
+    required int32 field51 = 51;
+    required int32 field52 = 52;
+    required int32 field53 = 53;
+    required int32 field54 = 54;
+    required int32 field55 = 55;
+    required int32 field56 = 56;
+    required int32 field57 = 57;
+    required int32 field58 = 58;
+    required int32 field59 = 59;
+    required int32 field60 = 60;
+    required int32 field61 = 61;
+    required int32 field62 = 62;
+/*    required int32 field63 = 63; */
+    required int32 field64 = 64;
+}
+

tests/no_messages.proto

@@ -0,0 +1,7 @@
+/* Test that a file without any messages works. */
+
+enum Test {
+    First = 1;
+}
+
+

tests/options.expected

@@ -0,0 +1,6 @@
+char filesize\[20\];
+char msgsize\[30\];
+char fieldsize\[40\];
+pb_callback_t int32_callback;
+\sEnumValue1 = 1
+Message5_EnumValue1

tests/options.proto

@@ -0,0 +1,56 @@
+/* Test nanopb option parsing.
+ * options.expected lists the patterns that are searched for in the output.
+ */
+
+import "nanopb.proto";
+
+// File level options
+option (nanopb_fileopt).max_size = 20;
+
+message Message1
+{
+    required string filesize = 1;
+}
+
+// Message level options
+message Message2
+{
+    option (nanopb_msgopt).max_size = 30;
+    required string msgsize = 1;
+}
+
+// Field level options
+message Message3
+{
+    required string fieldsize = 1 [(nanopb).max_size = 40];
+}
+
+// Forced callback field
+message Message4
+{
+    required int32 int32_callback = 1 [(nanopb).type = FT_CALLBACK];
+}
+
+// Short enum names
+enum Enum1
+{
+    option (nanopb_enumopt).long_names = false;
+    EnumValue1 = 1;
+    EnumValue2 = 2;
+}
+
+message EnumTest
+{
+    required Enum1 field = 1 [default = EnumValue2];
+}
+
+// Short enum names inside message
+message Message5
+{
+    enum Enum2
+    {
+       option (nanopb_enumopt).long_names = false;
+       EnumValue1 = 1;
+    }
+    required Enum2 field = 1 [default = EnumValue1];
+}

tests/test_decode1.c

@@ -17,7 +17,7 @@ bool print_person(pb_istream_t *stream)
     int i;
     Person person;
     
-    if (!pb_decode(stream, Person_msg, &person))
+    if (!pb_decode(stream, Person_fields, &person))
         return false;
     
     /* Now the decoding is done, rest is just to print stuff out. */
@@ -25,7 +25,7 @@ bool print_person(pb_istream_t *stream)
     printf("name: \"%s\"\n", person.name);
     printf("id: %ld\n", (long)person.id);
     
-    if (Person_has(person, email))
+    if (person.has_email)
         printf("email: \"%s\"\n", person.email);
     
     for (i = 0; i < person.phone_count; i++)
@@ -34,7 +34,7 @@ bool print_person(pb_istream_t *stream)
         printf("phone {\n");
         printf("  number: \"%s\"\n", phone->number);
         
-        if (Person_PhoneNumber_has(*phone, type))
+        if (phone->has_type)
         {
             switch (phone->type)
             {
@@ -63,13 +63,19 @@ int main()
     uint8_t buffer[512];
     size_t count = fread(buffer, 1, sizeof(buffer), stdin);
     
+    if (!feof(stdin))
+    {
+    	printf("Message does not fit in buffer\n");
+    	return 1;
+    }
+    
     /* Construct a pb_istream_t for reading from the buffer */
     pb_istream_t stream = pb_istream_from_buffer(buffer, count);
     
     /* Decode and print out the stuff */
     if (!print_person(&stream))
     {
-        printf("Parsing failed.\n");
+        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
         return 1;
     } else {
         return 0;

tests/test_decode2.c

@@ -13,7 +13,7 @@ bool print_person(pb_istream_t *stream)
     int i;
     Person person;
     
-    if (!pb_decode(stream, Person_msg, &person))
+    if (!pb_decode(stream, Person_fields, &person))
         return false;
     
     /* Now the decoding is done, rest is just to print stuff out. */
@@ -21,7 +21,7 @@ bool print_person(pb_istream_t *stream)
     printf("name: \"%s\"\n", person.name);
     printf("id: %ld\n", (long)person.id);
     
-    if (Person_has(person, email))
+    if (person.has_email)
         printf("email: \"%s\"\n", person.email);
     
     for (i = 0; i < person.phone_count; i++)
@@ -30,7 +30,7 @@ bool print_person(pb_istream_t *stream)
         printf("phone {\n");
         printf("  number: \"%s\"\n", phone->number);
         
-        if (Person_PhoneNumber_has(*phone, type))
+        if (phone->has_type)
         {
             switch (phone->type)
             {
@@ -59,13 +59,6 @@ bool callback(pb_istream_t *stream, uint8_t *buf, size_t count)
     FILE *file = (FILE*)stream->state;
     bool status;
     
-    if (buf == NULL)
-    {
-       /* Skipping data */
-        while (count-- && fgetc(file) != EOF);
-        return count == 0;
-    }
-    
     status = (fread(buf, 1, count, file) == count);
     
     if (feof(file))
@@ -82,7 +75,7 @@ int main()
     pb_istream_t stream = {&callback, stdin, 10000};
     if (!print_person(&stream))
     {
-        printf("Parsing failed.\n");
+        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
         return 1;
     } else {
         return 0;

tests/test_decode3.c

@@ -0,0 +1,194 @@
+/* Tests the decoding of all types.
+ * This is the counterpart of test_encode3.
+ * Run e.g. ./test_encode3 | ./test_decode3
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <pb_decode.h>
+#include "alltypes.pb.h"
+
+#define TEST(x) if (!(x)) { \
+    printf("Test " #x " failed.\n"); \
+    return false; \
+    }
+
+/* This function is called once from main(), it handles
+   the decoding and checks the fields. */
+bool check_alltypes(pb_istream_t *stream, int mode)
+{
+    AllTypes alltypes;
+    
+    /* Fill with garbage to better detect initialization errors */
+    memset(&alltypes, 0xAA, sizeof(alltypes));
+    
+    if (!pb_decode(stream, AllTypes_fields, &alltypes))
+        return false;
+    
+    TEST(alltypes.req_int32         == -1001);
+    TEST(alltypes.req_int64         == -1002);
+    TEST(alltypes.req_uint32        == 1003);
+    TEST(alltypes.req_uint64        == 1004);
+    TEST(alltypes.req_sint32        == -1005);
+    TEST(alltypes.req_sint64        == -1006);
+    TEST(alltypes.req_bool          == true);
+    
+    TEST(alltypes.req_fixed32       == 1008);
+    TEST(alltypes.req_sfixed32      == -1009);
+    TEST(alltypes.req_float         == 1010.0f);
+    
+    TEST(alltypes.req_fixed64       == 1011);
+    TEST(alltypes.req_sfixed64      == -1012);
+    TEST(alltypes.req_double        == 1013.0f);
+    
+    TEST(strcmp(alltypes.req_string, "1014") == 0);
+    TEST(alltypes.req_bytes.size == 4);
+    TEST(memcmp(alltypes.req_bytes.bytes, "1015", 4) == 0);
+    TEST(strcmp(alltypes.req_submsg.substuff1, "1016") == 0);
+    TEST(alltypes.req_submsg.substuff2 == 1016);
+    TEST(alltypes.req_submsg.substuff3 == 3);
+    TEST(alltypes.req_enum == MyEnum_Truth);
+    
+    TEST(alltypes.rep_int32_count == 5 && alltypes.rep_int32[4] == -2001 && alltypes.rep_int32[0] == 0);
+    TEST(alltypes.rep_int64_count == 5 && alltypes.rep_int64[4] == -2002 && alltypes.rep_int64[0] == 0);
+    TEST(alltypes.rep_uint32_count == 5 && alltypes.rep_uint32[4] == 2003 && alltypes.rep_uint32[0] == 0);
+    TEST(alltypes.rep_uint64_count == 5 && alltypes.rep_uint64[4] == 2004 && alltypes.rep_uint64[0] == 0);
+    TEST(alltypes.rep_sint32_count == 5 && alltypes.rep_sint32[4] == -2005 && alltypes.rep_sint32[0] == 0);
+    TEST(alltypes.rep_sint64_count == 5 && alltypes.rep_sint64[4] == -2006 && alltypes.rep_sint64[0] == 0);
+    TEST(alltypes.rep_bool_count == 5 && alltypes.rep_bool[4] == true && alltypes.rep_bool[0] == false);
+    
+    TEST(alltypes.rep_fixed32_count == 5 && alltypes.rep_fixed32[4] == 2008 && alltypes.rep_fixed32[0] == 0);
+    TEST(alltypes.rep_sfixed32_count == 5 && alltypes.rep_sfixed32[4] == -2009 && alltypes.rep_sfixed32[0] == 0);
+    TEST(alltypes.rep_float_count == 5 && alltypes.rep_float[4] == 2010.0f && alltypes.rep_float[0] == 0.0f);
+    
+    TEST(alltypes.rep_fixed64_count == 5 && alltypes.rep_fixed64[4] == 2011 && alltypes.rep_fixed64[0] == 0);
+    TEST(alltypes.rep_sfixed64_count == 5 && alltypes.rep_sfixed64[4] == -2012 && alltypes.rep_sfixed64[0] == 0);
+    TEST(alltypes.rep_double_count == 5 && alltypes.rep_double[4] == 2013.0 && alltypes.rep_double[0] == 0.0);
+    
+    TEST(alltypes.rep_string_count == 5 && strcmp(alltypes.rep_string[4], "2014") == 0 && alltypes.rep_string[0][0] == '\0');
+    TEST(alltypes.rep_bytes_count == 5 && alltypes.rep_bytes[4].size == 4 && alltypes.rep_bytes[0].size == 0);
+    TEST(memcmp(alltypes.rep_bytes[4].bytes, "2015", 4) == 0);
+
+    TEST(alltypes.rep_submsg_count == 5);
+    TEST(strcmp(alltypes.rep_submsg[4].substuff1, "2016") == 0 && alltypes.rep_submsg[0].substuff1[0] == '\0');
+    TEST(alltypes.rep_submsg[4].substuff2 == 2016 && alltypes.rep_submsg[0].substuff2 == 0);
+    TEST(alltypes.rep_submsg[4].substuff3 == 2016 && alltypes.rep_submsg[0].substuff3 == 3);
+    
+    TEST(alltypes.rep_enum_count == 5 && alltypes.rep_enum[4] == MyEnum_Truth && alltypes.rep_enum[0] == MyEnum_Zero);
+    
+    if (mode == 0)
+    {
+        /* Expect default values */
+        TEST(alltypes.has_opt_int32     == false);
+        TEST(alltypes.opt_int32         == 4041);
+        TEST(alltypes.has_opt_int64     == false);
+        TEST(alltypes.opt_int64         == 4042);
+        TEST(alltypes.has_opt_uint32    == false);
+        TEST(alltypes.opt_uint32        == 4043);
+        TEST(alltypes.has_opt_uint64    == false);
+        TEST(alltypes.opt_uint64        == 4044);
+        TEST(alltypes.has_opt_sint32    == false);
+        TEST(alltypes.opt_sint32        == 4045);
+        TEST(alltypes.has_opt_sint64    == false);
+        TEST(alltypes.opt_sint64        == 4046);
+        TEST(alltypes.has_opt_bool      == false);
+        TEST(alltypes.opt_bool          == false);
+        
+        TEST(alltypes.has_opt_fixed32   == false);
+        TEST(alltypes.opt_fixed32       == 4048);
+        TEST(alltypes.has_opt_sfixed32  == false);
+        TEST(alltypes.opt_sfixed32      == 4049);
+        TEST(alltypes.has_opt_float     == false);
+        TEST(alltypes.opt_float         == 4050.0f);
+        
+        TEST(alltypes.has_opt_fixed64   == false);
+        TEST(alltypes.opt_fixed64       == 4051);
+        TEST(alltypes.has_opt_sfixed64  == false);
+        TEST(alltypes.opt_sfixed64      == 4052);
+        TEST(alltypes.has_opt_double    == false);
+        TEST(alltypes.opt_double        == 4053.0);
+        
+        TEST(alltypes.has_opt_string    == false);
+        TEST(strcmp(alltypes.opt_string, "4054") == 0);
+        TEST(alltypes.has_opt_bytes     == false);
+        TEST(alltypes.opt_bytes.size == 4);
+        TEST(memcmp(alltypes.opt_bytes.bytes, "4055", 4) == 0);
+        TEST(alltypes.has_opt_submsg    == false);
+        TEST(strcmp(alltypes.opt_submsg.substuff1, "1") == 0);
+        TEST(alltypes.opt_submsg.substuff2 == 2);
+        TEST(alltypes.opt_submsg.substuff3 == 3);
+        TEST(alltypes.has_opt_enum     == false);
+        TEST(alltypes.opt_enum == MyEnum_Second);
+    }
+    else
+    {
+        /* Expect filled-in values */
+        TEST(alltypes.has_opt_int32     == true);
+        TEST(alltypes.opt_int32         == 3041);
+        TEST(alltypes.has_opt_int64     == true);
+        TEST(alltypes.opt_int64         == 3042);
+        TEST(alltypes.has_opt_uint32    == true);
+        TEST(alltypes.opt_uint32        == 3043);
+        TEST(alltypes.has_opt_uint64    == true);
+        TEST(alltypes.opt_uint64        == 3044);
+        TEST(alltypes.has_opt_sint32    == true);
+        TEST(alltypes.opt_sint32        == 3045);
+        TEST(alltypes.has_opt_sint64    == true);
+        TEST(alltypes.opt_sint64        == 3046);
+        TEST(alltypes.has_opt_bool      == true);
+        TEST(alltypes.opt_bool          == true);
+        
+        TEST(alltypes.has_opt_fixed32   == true);
+        TEST(alltypes.opt_fixed32       == 3048);
+        TEST(alltypes.has_opt_sfixed32  == true);
+        TEST(alltypes.opt_sfixed32      == 3049);
+        TEST(alltypes.has_opt_float     == true);
+        TEST(alltypes.opt_float         == 3050.0f);
+        
+        TEST(alltypes.has_opt_fixed64   == true);
+        TEST(alltypes.opt_fixed64       == 3051);
+        TEST(alltypes.has_opt_sfixed64  == true);
+        TEST(alltypes.opt_sfixed64      == 3052);
+        TEST(alltypes.has_opt_double    == true);
+        TEST(alltypes.opt_double        == 3053.0);
+        
+        TEST(alltypes.has_opt_string    == true);
+        TEST(strcmp(alltypes.opt_string, "3054") == 0);
+        TEST(alltypes.has_opt_bytes     == true);
+        TEST(alltypes.opt_bytes.size == 4);
+        TEST(memcmp(alltypes.opt_bytes.bytes, "3055", 4) == 0);
+        TEST(alltypes.has_opt_submsg    == true);
+        TEST(strcmp(alltypes.opt_submsg.substuff1, "3056") == 0);
+        TEST(alltypes.opt_submsg.substuff2 == 3056);
+        TEST(alltypes.opt_submsg.substuff3 == 3);
+        TEST(alltypes.has_opt_enum      == true);
+        TEST(alltypes.opt_enum == MyEnum_Truth);
+    }
+    
+    TEST(alltypes.end == 1099);
+    
+    return true;
+}
+
+int main(int argc, char **argv)
+{
+    /* Whether to expect the optional values or the default values. */
+    int mode = (argc > 1) ? atoi(argv[1]) : 0;
+    
+    /* Read the data into buffer */
+    uint8_t buffer[1024];
+    size_t count = fread(buffer, 1, sizeof(buffer), stdin);
+    
+    /* Construct a pb_istream_t for reading from the buffer */
+    pb_istream_t stream = pb_istream_from_buffer(buffer, count);
+    
+    /* Decode and print out the stuff */
+    if (!check_alltypes(&stream, mode))
+    {
+        printf("Parsing failed: %s\n", PB_GET_ERROR(&stream));
+        return 1;
+    } else {
+        return 0;
+    }
+}

tests/test_decode_callbacks.c

@@ -37,7 +37,7 @@ bool print_int32(pb_istream_t *stream, const pb_field_t *field, void *arg)
 bool print_fixed32(pb_istream_t *stream, const pb_field_t *field, void *arg)
 {
     uint32_t value;
-    if (!pb_dec_fixed32(stream, NULL, &value))
+    if (!pb_decode_fixed32(stream, &value))
         return false;
     
     printf((char*)arg, (long)value);
@@ -47,7 +47,7 @@ bool print_fixed32(pb_istream_t *stream, const pb_field_t *field, void *arg)
 bool print_fixed64(pb_istream_t *stream, const pb_field_t *field, void *arg)
 {
     uint64_t value;
-    if (!pb_dec_fixed64(stream, NULL, &value))
+    if (!pb_decode_fixed64(stream, &value))
         return false;
     
     printf((char*)arg, (long long)value);
@@ -84,7 +84,7 @@ int main()
     testmessage.fixed64value.funcs.decode = &print_fixed64;
     testmessage.fixed64value.arg = "fixed64value: %lld\n";
     
-    if (!pb_decode(&stream, TestMessage_msg, &testmessage))
+    if (!pb_decode(&stream, TestMessage_fields, &testmessage))
         return 1;
     
     return 0;

tests/test_encode1.c

@@ -10,21 +10,17 @@
 int main()
 {
     /* Initialize the structure with constants */
-    Person person = {{1 << Person_email_index},
-        "Test Person 99", 99, "test@person.com",
-        3, {{{1 << Person_PhoneNumber_type_index},
-             "555-12345678", Person_PhoneType_MOBILE},
-            {{1 << Person_PhoneNumber_type_index},
-             "99-2342", 0},
-            {{1 << Person_PhoneNumber_type_index},
-             "1234-5678", Person_PhoneType_WORK},
+    Person person = {"Test Person 99", 99, true, "test@person.com",
+        3, {{"555-12345678", true, Person_PhoneType_MOBILE},
+            {"99-2342", false, 0},
+            {"1234-5678", true, Person_PhoneType_WORK},
         }};
 
     uint8_t buffer[512];
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
     
     /* Now encode it and check if we succeeded. */
-    if (pb_encode(&stream, Person_msg, &person))
+    if (pb_encode(&stream, Person_fields, &person))
     {
         fwrite(buffer, 1, stream.bytes_written, stdout);
         return 0; /* Success */

tests/test_encode2.c

@@ -15,21 +15,17 @@ bool streamcallback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
 int main()
 {
     /* Initialize the structure with constants */
-    Person person = {{1 << Person_email_index},
-        "Test Person 99", 99, "test@person.com",
-        3, {{{1 << Person_PhoneNumber_type_index},
-             "555-12345678", Person_PhoneType_MOBILE},
-            {{1 << Person_PhoneNumber_type_index},
-             "99-2342", 0},
-            {{1 << Person_PhoneNumber_type_index},
-             "1234-5678", Person_PhoneType_WORK},
+    Person person = {"Test Person 99", 99, true, "test@person.com",
+        3, {{"555-12345678", true, Person_PhoneType_MOBILE},
+            {"99-2342", false, 0},
+            {"1234-5678", true, Person_PhoneType_WORK},
         }};
     
     /* Prepare the stream, output goes directly to stdout */
     pb_ostream_t stream = {&streamcallback, stdout, SIZE_MAX, 0};
     
     /* Now encode it and check if we succeeded. */
-    if (pb_encode(&stream, Person_msg, &person))
+    if (pb_encode(&stream, Person_fields, &person))
         return 0; /* Success */
     else
         return 1; /* Failure */

tests/test_encode3.c

@@ -0,0 +1,128 @@
+/* Attempts to test all the datatypes supported by ProtoBuf.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pb_encode.h>
+#include "alltypes.pb.h"
+
+int main(int argc, char **argv)
+{
+    int mode = (argc > 1) ? atoi(argv[1]) : 0;
+    
+    /* Initialize the structure with constants */
+    AllTypes alltypes = {0};
+    
+    alltypes.req_int32         = -1001;
+    alltypes.req_int64         = -1002;
+    alltypes.req_uint32        = 1003;
+    alltypes.req_uint64        = 1004;
+    alltypes.req_sint32        = -1005;
+    alltypes.req_sint64        = -1006;
+    alltypes.req_bool          = true;
+    
+    alltypes.req_fixed32       = 1008;
+    alltypes.req_sfixed32      = -1009;
+    alltypes.req_float         = 1010.0f;
+    
+    alltypes.req_fixed64       = 1011;
+    alltypes.req_sfixed64      = -1012;
+    alltypes.req_double        = 1013.0;
+    
+    strcpy(alltypes.req_string, "1014");
+    alltypes.req_bytes.size = 4;
+    memcpy(alltypes.req_bytes.bytes, "1015", 4);
+    strcpy(alltypes.req_submsg.substuff1, "1016");
+    alltypes.req_submsg.substuff2 = 1016;
+    alltypes.req_enum = MyEnum_Truth;
+    
+    alltypes.rep_int32_count = 5; alltypes.rep_int32[4] = -2001;
+    alltypes.rep_int64_count = 5; alltypes.rep_int64[4] = -2002;
+    alltypes.rep_uint32_count = 5; alltypes.rep_uint32[4] = 2003;
+    alltypes.rep_uint64_count = 5; alltypes.rep_uint64[4] = 2004;
+    alltypes.rep_sint32_count = 5; alltypes.rep_sint32[4] = -2005;
+    alltypes.rep_sint64_count = 5; alltypes.rep_sint64[4] = -2006;
+    alltypes.rep_bool_count = 5; alltypes.rep_bool[4] = true;
+    
+    alltypes.rep_fixed32_count = 5; alltypes.rep_fixed32[4] = 2008;
+    alltypes.rep_sfixed32_count = 5; alltypes.rep_sfixed32[4] = -2009;
+    alltypes.rep_float_count = 5; alltypes.rep_float[4] = 2010.0f;
+    
+    alltypes.rep_fixed64_count = 5; alltypes.rep_fixed64[4] = 2011;
+    alltypes.rep_sfixed64_count = 5; alltypes.rep_sfixed64[4] = -2012;
+    alltypes.rep_double_count = 5; alltypes.rep_double[4] = 2013.0;
+    
+    alltypes.rep_string_count = 5; strcpy(alltypes.rep_string[4], "2014");
+    alltypes.rep_bytes_count = 5; alltypes.rep_bytes[4].size = 4;
+    memcpy(alltypes.rep_bytes[4].bytes, "2015", 4);
+
+    alltypes.rep_submsg_count = 5;
+    strcpy(alltypes.rep_submsg[4].substuff1, "2016");
+    alltypes.rep_submsg[4].substuff2 = 2016;
+    alltypes.rep_submsg[4].has_substuff3 = true;
+    alltypes.rep_submsg[4].substuff3 = 2016;
+    
+    alltypes.rep_enum_count = 5; alltypes.rep_enum[4] = MyEnum_Truth;
+    
+    if (mode != 0)
+    {
+        /* Fill in values for optional fields */
+        alltypes.has_opt_int32 = true;
+        alltypes.opt_int32         = 3041;
+        alltypes.has_opt_int64 = true;
+        alltypes.opt_int64         = 3042;
+        alltypes.has_opt_uint32 = true;
+        alltypes.opt_uint32        = 3043;
+        alltypes.has_opt_uint64 = true;
+        alltypes.opt_uint64        = 3044;
+        alltypes.has_opt_sint32 = true;
+        alltypes.opt_sint32        = 3045;
+        alltypes.has_opt_sint64 = true;
+        alltypes.opt_sint64        = 3046;
+        alltypes.has_opt_bool = true;
+        alltypes.opt_bool          = true;
+        
+        alltypes.has_opt_fixed32 = true;
+        alltypes.opt_fixed32       = 3048;
+        alltypes.has_opt_sfixed32 = true;
+        alltypes.opt_sfixed32      = 3049;
+        alltypes.has_opt_float = true;
+        alltypes.opt_float         = 3050.0f;
+        
+        alltypes.has_opt_fixed64 = true;
+        alltypes.opt_fixed64       = 3051;
+        alltypes.has_opt_sfixed64 = true;
+        alltypes.opt_sfixed64      = 3052;
+        alltypes.has_opt_double = true;
+        alltypes.opt_double        = 3053.0;
+        
+        alltypes.has_opt_string = true;
+        strcpy(alltypes.opt_string, "3054");
+        alltypes.has_opt_bytes = true;
+        alltypes.opt_bytes.size = 4;
+        memcpy(alltypes.opt_bytes.bytes, "3055", 4);
+        alltypes.has_opt_submsg = true;
+        strcpy(alltypes.opt_submsg.substuff1, "3056");
+        alltypes.opt_submsg.substuff2 = 3056;
+        alltypes.has_opt_enum = true;
+        alltypes.opt_enum = MyEnum_Truth;
+    }
+    
+    alltypes.end = 1099;
+    
+    uint8_t buffer[1024];
+    pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+    
+    /* Now encode it and check if we succeeded. */
+    if (pb_encode(&stream, AllTypes_fields, &alltypes))
+    {
+        fwrite(buffer, 1, stream.bytes_written, stdout);
+        return 0; /* Success */
+    }
+    else
+    {
+        fprintf(stderr, "Encoding failed!\n");
+        return 1; /* Failure */
+    }
+}

tests/test_encode_callbacks.c

@@ -29,7 +29,7 @@ bool encode_fixed32(pb_ostream_t *stream, const pb_field_t *field, const void *a
         return false;
     
     uint32_t value = 42;
-    return pb_enc_fixed32(stream, field, &value);
+    return pb_encode_fixed32(stream, &value);
 }
 
 bool encode_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *arg)
@@ -38,7 +38,7 @@ bool encode_fixed64(pb_ostream_t *stream, const pb_field_t *field, const void *a
         return false;
     
     uint64_t value = 42;
-    return pb_enc_fixed64(stream, field, &value);
+    return pb_encode_fixed64(stream, &value);
 }
 
 int main()
@@ -52,13 +52,13 @@ int main()
     testmessage.fixed32value.funcs.encode = &encode_fixed32;
     testmessage.fixed64value.funcs.encode = &encode_fixed64;
     
-    TestMessage_set(testmessage, submsg);
+    testmessage.has_submsg = true;
     testmessage.submsg.stringvalue.funcs.encode = &encode_string;
     testmessage.submsg.int32value.funcs.encode = &encode_int32;
     testmessage.submsg.fixed32value.funcs.encode = &encode_fixed32;
     testmessage.submsg.fixed64value.funcs.encode = &encode_fixed64;
     
-    if (!pb_encode(&stream, TestMessage_msg, &testmessage))
+    if (!pb_encode(&stream, TestMessage_fields, &testmessage))
         return 1;
     
     if (fwrite(buffer, stream.bytes_written, 1, stdout) != 1)

tests/test_missing_fields.c

@@ -0,0 +1,49 @@
+/* Checks that missing required fields are detected properly */
+
+#include <stdio.h>
+#include <pb_encode.h>
+#include <pb_decode.h>
+#include "missing_fields.pb.h"
+
+int main()
+{
+    uint8_t buffer[512] = {};
+    
+    /* Create a message with one missing field */
+    {
+        MissingField msg = {};
+        pb_ostream_t stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
+        if (!pb_encode(&stream, MissingField_fields, &msg))
+        {
+            printf("Encode failed.\n");
+            return 1;
+        }
+    }
+
+    /* Test that it decodes properly if we don't require that field */
+    {
+        MissingField msg = {};
+        pb_istream_t stream = pb_istream_from_buffer(buffer, sizeof(buffer));
+        
+        if (!pb_decode(&stream, MissingField_fields, &msg))
+        {
+            printf("Decode failed: %s\n", PB_GET_ERROR(&stream));
+            return 2;
+        }
+    }
+    
+    /* Test that it does *not* decode properly if we require the field */
+    {
+        AllFields msg = {};
+        pb_istream_t stream = pb_istream_from_buffer(buffer, sizeof(buffer));
+        
+        if (pb_decode(&stream, AllFields_fields, &msg))
+        {
+            printf("Decode didn't detect missing field.\n");
+            return 3;
+        }
+    }
+    
+    return 0; /* All ok */
+}
+

tests/test_multiple_files.c

@@ -0,0 +1,13 @@
+/*
+ * Tests if still compile if typedefs are redfefined in STATIC_ASSERTS when
+ * proto file includes another poto file
+ */
+
+#include <stdio.h>
+#include <pb_encode.h>
+#include "callbacks2.pb.h"
+
+int main()
+{
+	return 0;
+}

tests/unittestproto.proto

@@ -26,28 +26,3 @@ message CallbackContainer {
 message CallbackContainerContainer {
     required CallbackContainer submsg = 1;
 }
-
-message DefaultContainer {
-    optional int32 data = 1 [default = 10];
-}
-
-message PointerContainer {
-    required string text = 1 [(nanopb).pointer = true];
-    required bytes blob = 2 [(nanopb).pointer = true];
-    required DefaultContainer submsg = 3 [(nanopb).pointer = true];
-    // This should be rejected:
-    // required int32 data = 4 [(nanopb).pointer = true];
-    repeated string rtext = 5 [(nanopb).pointer = true, (nanopb).max_count = 10];
-    repeated bytes rblob = 6 [(nanopb).pointer = true, (nanopb).max_count = 10];
-    repeated IntegerArray rsubmsg = 7 [(nanopb).pointer = true, (nanopb).max_count = 10];
-    optional string otext = 8 [(nanopb).pointer = true];
-    optional bytes oblob = 9 [(nanopb).pointer = true];
-}
-
-message RecursiveRef_A {
-    optional RecursiveRef_B submsg = 1 [(nanopb).pointer = true];
-}
-
-message RecursiveRef_B {
-    required RecursiveRef_A submsg = 1;
-}

tools/set_version.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Run this from the top directory of nanopb tree.
+# e.g. user@localhost:~/nanopb$ tools/set_version.sh nanopb-0.1.9-dev
+# It sets the version number in pb.h and generator/nanopb_generator.py.
+
+sed -i -e 's/nanopb_version\s*=\s*"[^"]*"/nanopb_version = "'$1'"/' generator/nanopb_generator.py
+sed -i -e 's/#define\s*NANOPB_VERSION\s*.*/#define NANOPB_VERSION '$1'/' pb.h
+
+