Fixed pb_get_message_size

Code reduction optimization by sharing common field descriptor information for numeric field types
2012-02-27 14:46:38 -08:00 · 2012-02-24 13:46:36 -08:00
30 changed files with 1124 additions and 1162 deletions
--- a/9
+++ b/9
@@ -7,3 +7,12 @@ protobuf-compiler python-protobuf libprotobuf-dev

 To run the tests, run make under the tests folder.
 If it completes without error, everything is fine. 
+
+Code size optimization is currently only supported for 32-bit 
+architecture. If you want to run on 64-bit architecture,
+you must disable code size optimization by providing -n option to
+code generator nanopb_generator.py.  
+
+For testing purpose, you may need to pass -m32 compiler to gcc if 
+you're running on a 64-bit machine unless -n option is used for code 
+generation. 
--- a/docs/reference.rst
+++ b/docs/reference.rst
@@ -6,26 +6,6 @@ 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.
-============================  ================================================================================================
-
-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
 ====

@@ -86,7 +66,7 @@ Describes a single structure field with memory position in relation to others. T
 :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 give error if the values are too large. The types can be changed to larger ones by defining *PB_FIELD_16BIT*.
+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.

 pb_bytes_array_t
 ----------------
@@ -169,13 +149,17 @@ Encodes the contents of a structure as a protocol buffers message and writes it

 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.

-.. sidebar:: Encoding fields manually
+pb_encode_varint
+----------------
+Encodes an unsigned integer in the varint_ format. ::

-    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.
+    bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);

-    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.
+:stream:        Output stream to write to. 1-10 bytes will be written.
+:value:         Value to encode.
+:returns:       True on success, false on IO error.

-    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.
+.. _varint: http://code.google.com/apis/protocolbuffers/docs/encoding.html#varints

 pb_encode_tag
 -------------
@@ -185,7 +169,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. You can get it from field->tag.
+:field_number:  Identifier for the field, defined in the .proto file.
 :returns:       True on success, false on IO error.

 pb_encode_tag_for_field
@@ -211,71 +195,107 @@ 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. Works for fields of type `bytes` and `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_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. Pass `strlen(s)` for strings.
+:size:          Number of bytes in the string.
 :returns:       True on success, false on IO error.

-pb_encode_fixed32
-----------------
-Writes 4 bytes to stream and swaps bytes on big-endian architectures. Works for fields of type `fixed32`, `sfixed32` and `float`::
+.. sidebar:: Field encoders

-    bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
+    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.

-: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.
+    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*.

-pb_encode_fixed64
-----------------
-Writes 8 bytes to stream and swaps bytes on big-endian architecture. Works for fields of type `fixed64`, `sfixed64` and `double`::
+    Each field encoder only encodes the contents of the field. The tag must be encoded separately with `pb_encode_tag_for_field`_.

-    bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
+    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*.

-: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_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`_. ::

-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);
+    bool pb_enc_varint(pb_ostream_t *stream, const pb_field_t *field, const void *src);

 :stream:        Output stream to write to.
-:fields:        Pointer to the autogenerated field description array for the submessage type, e.g. `MyMessage_fields`.
+: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
+-----------------
+Field encoder for PB_LTYPE_SUBMESSAGE. Calls `pb_encode`_ to perform the actual encoding. ::
+
+    bool pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src);
+
+:stream:        Output stream to write to.
+:field:         Field description structure. The *ptr* field must be a pointer to a field description array for the submessage.
 :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 garbage will be written to the output before the problem is detected.
+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_decode.h
 ===========
@@ -303,23 +323,6 @@ 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
---------
-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_varint
 ----------------
 Read and decode a varint_ encoded integer. ::
@@ -348,30 +351,24 @@ 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_tag
-------------
-Decode the tag that comes before field in the protobuf encoding::
+pb_decode
+---------
+Read and decode all fields of a structure. Reads until EOF on input stream. ::

-    bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, int *tag, bool *eof);
+    bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);

 :stream:        Input stream to read from.
-: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.
+: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.

-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 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.

-pb_skip_field
-------------
-Remove the data for a field from the stream, without actually decoding it::
+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.

-    bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
+For optional fields, this function applies the default value and sets *has_<field>* to false if the field is not present.

-:stream:        Input stream to read from.
-:wire_type:     Type of field to skip.
-:returns:       True on success, false on IO error.
+Because of memory concerns, the detection of missing required fields is not perfect if the structure contains more than 32 fields.

 .. sidebar:: Field decoders
    
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,14 +1,24 @@
 CFLAGS=-ansi -Wall -Werror -I .. -g -O0
-DEPS=../pb_decode.c ../pb_decode.h ../pb_encode.c ../pb_encode.h ../pb.h
+DEPS=../pb_decode.c ../pb_decode.h ../pb_encode.c ../pb_field.c ../pb_encode.h ../pb.h ../pb_field.h
+
+CC_VER := $(shell gcc --version | grep gcc)
+ifneq "$(CC_VER)" ""
+CFLAGS += -m32
+endif
+ifndef PB_PATH
+PBPATHOPT=-I/usr/include -I/usr/local/include
+else
+PBPATHOPT=-I$(PB_PATH)
+endif

 all: server client

 clean:
-	rm -f server client fileproto.pb.c fileproto.pb.h
+	rm -f server client fileproto.pb.c fileproto.pb.h fileproto.pb

 %: %.c $(DEPS) fileproto.pb.h fileproto.pb.c
-	$(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c fileproto.pb.c common.c
+	$(CC) $(CFLAGS) -o $@ $< ../pb_decode.c ../pb_encode.c ../pb_field.c fileproto.pb.c common.c

 fileproto.pb.c fileproto.pb.h: fileproto.proto ../generator/nanopb_generator.py
-	protoc -I. -I../generator -I/usr/include -ofileproto.pb $<
+	protoc -I. -I../generator $(PBPATHOPT) -ofileproto.pb $<
 	python ../generator/nanopb_generator.py fileproto.pb
--- a/example/client.c
+++ b/example/client.c
@@ -30,7 +30,7 @@ bool printfile_callback(pb_istream_t *stream, const pb_field_t *field, void *arg
    if (!pb_decode(stream, FileInfo_fields, &fileinfo))
        return false;
    
-    printf("%-10lld %s\n", (long long)fileinfo.inode, fileinfo.name);
+    printf("%-10lld %s\n", fileinfo.inode, fileinfo.name);
    
    return true;
 }
--- a/example/common.c
+++ b/example/common.c
@@ -10,13 +10,13 @@

 static bool write_callback(pb_ostream_t *stream, const uint8_t *buf, size_t count)
 {
-    int fd = (intptr_t)stream->state;
+    int fd = (int)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 = (intptr_t)stream->state;
+    int fd = (int)stream->state;
    int result;
    
    if (buf == NULL)
@@ -38,12 +38,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*)(intptr_t)fd, SIZE_MAX, 0};
+    pb_ostream_t stream = {&write_callback, (void*)fd, SIZE_MAX, 0};
    return stream;
 }

 pb_istream_t pb_istream_from_socket(int fd)
 {
-    pb_istream_t stream = {&read_callback, (void*)(intptr_t)fd, SIZE_MAX};
+    pb_istream_t stream = {&read_callback, (void*)fd, SIZE_MAX};
    return stream;
 }
--- a/example/common.h
+++ b/example/common.h
@@ -7,3 +7,4 @@ pb_ostream_t pb_ostream_from_socket(int fd);
 pb_istream_t pb_istream_from_socket(int fd);

 #endif
+
--- a/example/server.c
+++ b/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_encode_submessage(stream, FileInfo_fields, &fileinfo))
+        if (!pb_enc_submessage(stream, field, &fileinfo))
            return false;
    }
    
--- a/example_unions/Makefile
+++ b/example_unions/Makefile
@@ -1,17 +0,0 @@
-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
--- a/example_unions/decode.c
+++ b/example_unions/decode.c
@@ -1,92 +0,0 @@
-/* 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;
-    int 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_field_t field = {}; /* NB: Could get rid of this wrapper by fixing issue #2. */
-    field.ptr = fields;
-    
-    return pb_dec_submessage(stream, &field, dest_struct);
-}
-
-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("Decoding failed.\n");
-        return 1;
-    }
-    
-    return 0;
-}
-
-
-
--- a/example_unions/encode.c
+++ b/example_unions/encode.c
@@ -1,85 +0,0 @@
-/* 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 */
-    }
-}
-
-
--- a/example_unions/unionproto.proto
+++ b/example_unions/unionproto.proto
@@ -1,30 +0,0 @@
-// 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;
-}
-
--- a/generator/Makefile
+++ b/generator/Makefile
@@ -1,2 +1,8 @@
+ifndef PB_PATH
+PBPATHOPT=-I/usr/include -I/usr/local/include
+else
+PBPATHOPT=-I$(PB_PATH)
+endif
+
 nanopb_pb2.py: nanopb.proto
-	protoc --python_out=. -I /usr/include -I . nanopb.proto
+	protoc --python_out=. $(PBPATHOPT) -I . nanopb.proto
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -1,45 +1,25 @@
 '''Generate header file for nanopb from a ProtoBuf FileDescriptorSet.'''

-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
-
+import google.protobuf.descriptor_pb2 as descriptor
+import nanopb_pb2
 import os.path

-# Values are tuple (c type, pb ltype)
+# Values are tuple (c type, pb ltype, memory aligned flag, common field info type)
 FieldD = descriptor.FieldDescriptorProto
 datatypes = {
-    FieldD.TYPE_BOOL: ('bool', 'PB_LTYPE_VARINT'),
-    FieldD.TYPE_DOUBLE: ('double', 'PB_LTYPE_FIXED64'),
-    FieldD.TYPE_FIXED32: ('uint32_t', 'PB_LTYPE_FIXED32'),
-    FieldD.TYPE_FIXED64: ('uint64_t', 'PB_LTYPE_FIXED64'),
-    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_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')
+    FieldD.TYPE_BOOL: ('bool', 'PB_LTYPE_VARINT', False, 'BOOL'),
+    FieldD.TYPE_DOUBLE: ('double', 'PB_LTYPE_FIXED64', True, 'FIXED64'),
+    FieldD.TYPE_FIXED32: ('uint32_t', 'PB_LTYPE_FIXED32', True, 'FIXED32'),
+    FieldD.TYPE_FIXED64: ('uint64_t', 'PB_LTYPE_FIXED64', True, 'FIXED64'),
+    FieldD.TYPE_FLOAT: ('float', 'PB_LTYPE_FIXED32', True, 'FIXED32'),
+    FieldD.TYPE_INT32: ('int32_t', 'PB_LTYPE_VARINT', True, 'INT32'),
+    FieldD.TYPE_INT64: ('int64_t', 'PB_LTYPE_VARINT', True, 'INT64'),
+    FieldD.TYPE_SFIXED32: ('int32_t', 'PB_LTYPE_FIXED32', True, 'FIXED32'),
+    FieldD.TYPE_SFIXED64: ('int64_t', 'PB_LTYPE_FIXED64', True, 'FIXED64'),
+    FieldD.TYPE_SINT32: ('int32_t', 'PB_LTYPE_SVARINT', True, 'SINT32'),
+    FieldD.TYPE_SINT64: ('int64_t', 'PB_LTYPE_SVARINT', True, "SINT64"),
+    FieldD.TYPE_UINT32: ('uint32_t', 'PB_LTYPE_VARINT', True, 'INT32'),
+    FieldD.TYPE_UINT64: ('uint64_t', 'PB_LTYPE_VARINT', True, 'INT64')
 }

 class Names:
@@ -90,6 +70,9 @@ class Field:
        self.max_size = None
        self.max_count = None
        self.array_decl = ""
+        self.is_last_field = False
+        self.aligned = False
+        self.info_index = None
        
        # Parse nanopb-specific field options
        if desc.options.HasExtension(nanopb_pb2.nanopb):
@@ -124,10 +107,12 @@ class Field:
        # defining how to decode an individual value.
        # CTYPE is the name of the c type to use in the struct.
        if datatypes.has_key(desc.type):
-            self.ctype, self.ltype = datatypes[desc.type]
+            self.ctype, self.ltype, self.aligned, self.common_info_name = datatypes[desc.type]
        elif desc.type == FieldD.TYPE_ENUM:
            self.ltype = 'PB_LTYPE_VARINT'
            self.ctype = names_from_type_name(desc.type_name)
+            self.aligned = True
+            self.common_info_name = 'INT32'
            if self.default is not None:
                self.default = self.ctype + self.default
        elif desc.type == FieldD.TYPE_STRING:
@@ -212,15 +197,33 @@ class Field:
        else:
            return 'const %s %s_default%s = %s;' % (ctype, self.struct_name + self.name, array_decl, default)

+    def pb_field_key_t(self):
+        '''Return the pb_field_t field key initializer to use in the constant array.
+        '''
+        result = '    {%d' % self.tag
+        if self.is_last_field:
+            result += ' | PB_LAST_FIELD'
+            
+        if self.info_index is not None:
+            result += ', %d}' % self.info_index
+        else:
+            if 'REQUIRED' in self.htype:
+                prefix = 'REQUIRED'
+            elif 'OPTIONAL' in self.htype:
+                prefix = 'OPTIONAL'
+            result += ', %s_%s_INFO}' % (prefix, self.common_info_name)
+        return result
+    
    def pb_field_t(self, prev_field_name):
-        '''Return the pb_field_t initializer to use in the constant array.
+        '''Return the pb_field_t field info initializer to use in the constant array.
        prev_field_name is the name of the previous field or None.
        '''
+        ''' result = '    {0, '''
        result = '    {%d, ' % self.tag        
-        result += '(pb_type_t) ((int) ' + self.htype
+        result += self.htype
        if self.ltype is not None:
-            result += ' | (int) ' + self.ltype
-        result += '),\n'
+            result += ' | ' + self.ltype          
+        result += ',\n'
        
        if prev_field_name is None:
            result += '    offsetof(%s, %s),' % (self.struct_name, self.name)
@@ -252,17 +255,8 @@ class Field:
        
        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)        
-
+    def should_generate_field_info(self, prev):
+        return  g_no_optimization or not ((prev is None or prev.aligned) and (self.ltype in ['PB_LTYPE_VARINT', 'PB_LTYPE_SVARINT', 'PB_LTYPE_FIXED32', 'PB_LTYPE_FIXED64']) and (self.htype in ['PB_HTYPE_REQUIRED', 'PB_HTYPE_OPTIONAL']))
    
 class Message:
    def __init__(self, names, desc):
@@ -270,6 +264,15 @@ class Message:
        self.fields = [Field(self.name, f) for f in desc.field]
        self.ordered_fields = self.fields[:]
        self.ordered_fields.sort()
+        if self.ordered_fields:
+            self.ordered_fields[-1].is_last_field = True
+        self.num_info = 0
+        prev = None
+        for f in self.ordered_fields:
+            if f.should_generate_field_info(prev):
+                f.info_index = self.num_info
+                self.num_info += 1
+            prev = f
        
    def get_dependencies(self):
        '''Get list of type names that this structure refers to.'''
@@ -298,19 +301,48 @@ class Message:
        return result

    def fields_declaration(self):
-        result = 'extern const pb_field_t %s_fields[%d];' % (self.name, len(self.fields) + 1)
+        result = 'extern const pb_field_info_t %s_fields[1];' % self.name
+         
        return result

    def fields_definition(self):
-        result = 'const pb_field_t %s_fields[%d] = {\n' % (self.name, len(self.fields) + 1)
+        num_fields = len(self.fields)
+        
+        result = 'static const pb_field_key_t %s_field_keys[%d] = {\n' % (self.name, num_fields)

-        prev = None
        for field in self.ordered_fields:
-            result += field.pb_field_t(prev)
-            result += ',\n\n'
-            prev = field.name
+            result += field.pb_field_key_t()
+            if not field.is_last_field:
+                result += ',\n'
+            prev = field                
+        result += '\n};\n\n'
+    
+        if self.num_info > 0:
+            result += 'static const pb_field_t %s_field_info[%d] = {\n' % (self.name, self.num_info)    
+            prev = None
+            for field in self.ordered_fields:
+                if field.info_index is not None:
+                    result += field.pb_field_t(prev)
+                    if field.info_index < self.num_info - 1:
+                        result += ',\n\n'
+                prev = field.name
+            result += '\n};\n\n'
+        
+        decl = 'const pb_field_info_t %s_fields[1] = { {' % self.name
+        
+        if num_fields == 0:
+            result = decl
+            result += '\n    0,'
+            result += '\n    0' 
+        else:
+            result += decl
+            result += '\n    &%s_field_keys[0],' % self.name
+            if self.num_info > 0:
+                result += '\n    &%s_field_info[0]' % self.name
+            else:
+                result += '\n    0' 
+        result += '\n}};\n' 
        
-        result += '    PB_LAST_FIELD\n};'
        return result

 def iterate_messages(desc, names = Names()):
@@ -342,7 +374,7 @@ def parse_file(fdesc):
        enums.append(Enum(base_name, enum))
    
    for names, message in iterate_messages(fdesc, base_name):
-        messages.append(Message(names, message))
+        messages.append(Message(names,message))
        for enum in message.enum_type:
            enums.append(Enum(names, enum))
    
@@ -355,7 +387,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()) - set(data.keys())
+    extra_items_in_deps = reduce(set.union, data.values()) - 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)
@@ -414,51 +446,6 @@ def generate_header(dependencies, headername, enums, messages):
    for msg in messages:
        yield msg.fields_declaration() + '\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 = []
-    for msg in messages:
-        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)
-                yield 'STATIC_ASSERT((%s), YOU_MUST_DEFINE_PB_FIELD_16BIT)\n' % assertion
-            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)
-                yield 'STATIC_ASSERT((%s), YOU_MUST_DEFINE_PB_FIELD_32BIT)\n' % assertion
-            yield '#endif\n'
-    
-    # End of header
    yield '\n#endif\n'

 def generate_source(headername, enums, messages):
@@ -478,19 +465,25 @@ def generate_source(headername, enums, messages):
 if __name__ == '__main__':
    import sys
    import os.path
+    from optparse import OptionParser
+    usage = "usage: %prog [options] file.pb\n" + \
+            "where file.pb has been compiled from .proto by:\n" + \
+            "    protoc -ofile.pb file.proto\n" + \
+            "Output fill be written to file.pb.h and file.pb.c"

-    if len(sys.argv) != 2:
-        print "Usage: " + sys.argv[0] + " file.pb"
-        print "where file.pb has been compiled from .proto by:"
-        print "protoc -ofile.pb file.proto"
-        print "Output fill be written to file.pb.h and file.pb.c"
+    parser = OptionParser(usage=usage)
+    parser.add_option('-n', '--no-opt', action='store_true', dest='no_optimization', default=False, help='disable code reduction optimization as 64-bit architecture is not supported [default=optimization on]')
+    (options, args) = parser.parse_args()
+    
+    if len(args) != 1:
+        parser.print_help()
        sys.exit(1)
-    
-    data = open(sys.argv[1], 'rb').read()
+    g_no_optimization = options.no_optimization
+    data = open(args[0], 'rb').read()
    fdesc = descriptor.FileDescriptorSet.FromString(data)
    enums, messages = parse_file(fdesc.file[0])
    
-    noext = os.path.splitext(sys.argv[1])[0]
+    noext = os.path.splitext(args[0])[0]
    headername = noext + '.pb.h'
    sourcename = noext + '.pb.c'
    headerbasename = os.path.basename(headername)
@@ -499,7 +492,7 @@ if __name__ == '__main__':
    
    # 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']
+    excludes = ['nanopb.proto']
    dependencies = [d for d in fdesc.file[0].dependency if d not in excludes]
    
    header = open(headername, 'w')
--- a/pb.h
+++ b/pb.h
@@ -5,150 +5,7 @@
 * Most of these are quite low-level stuff. For the high-level interface,
 * see pb_encode.h or pb_decode.h
 */
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
-
-#ifdef __GNUC__
-/* This just reduces memory requirements, but is not required. */
-#define pb_packed __attribute__((packed))
-#else
-#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. */
-#ifndef STATIC_ASSERT
-#define STATIC_ASSERT(COND,MSG) typedef char static_assertion_##MSG[(COND)?1:-1];
-#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.
- * 
- * INT32 and UINT32 are treated the same, as are (U)INT64 and (S)FIXED*
- * These types are simply casted to correct field type when they are
- * assigned to the memory pointer.
- * SINT* is different, though, because it is zig-zag coded.
- */
-
-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,
-    
-    /******************
-     * 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_packed pb_type_t;
-
-#define PB_HTYPE(x) ((x) & 0xF0)
-#define PB_LTYPE(x) ((x) & 0x0F)
-
-/* This structure is used in auto-generated constants
- * to specify struct fields.
- * 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. 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
-    
-    /* Field definitions for submessage
-     * OR default value for all other non-array, non-callback types
-     * If null, then field will zeroed. */
-    const void *ptr;
-} pb_packed;
-
-/* This structure is used for 'bytes' arrays.
- * 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 {
-    size_t size;
-    uint8_t bytes[1];
-} pb_bytes_array_t;
+#include <pb_field.h>

 /* This structure is used for giving the callback function.
 * It is stored in the message structure and filled in by the method that
@@ -189,12 +46,4 @@ typedef enum {
    PB_WT_32BIT  = 5
 } pb_wire_type_t;

-/* These macros are used to declare pb_field_t's in the constant array. */
-#define pb_membersize(st, m) (sizeof ((st*)0)->m)
-#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,(pb_type_t) 0,0,0}
-
-
 #endif
--- a/pb_decode.c
+++ b/pb_decode.c
@@ -75,7 +75,7 @@ static bool checkreturn pb_decode_varint32(pb_istream_t *stream, uint32_t *dest)
 {
    uint64_t temp;
    bool status = pb_decode_varint(stream, &temp);
-    *dest = (uint32_t)temp;
+    *dest = temp;
    return status;
 }

@@ -117,33 +117,12 @@ bool checkreturn pb_skip_string(pb_istream_t *stream)
    return pb_read(stream, NULL, length);
 }

-bool checkreturn pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, int *tag, bool *eof)
-{
-    uint32_t temp;
-    *eof = false;
-    *wire_type = 0;
-    *tag = 0;
+/* 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.
+ */

-    if (!pb_decode_varint32(stream, &temp))
-    {
-        if (stream->bytes_left == 0)
-            *eof = true;
-
-        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)
+static bool checkreturn skip(pb_istream_t *stream, pb_wire_type_t wire_type)
 {
    switch (wire_type)
    {
@@ -204,88 +183,26 @@ static bool checkreturn make_string_substream(pb_istream_t *stream, pb_istream_t
    return true;
 }

-/* Iterator for pb_field_t list */
-typedef struct {
-    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_field_t *fields, void *dest_struct)
-{
-    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;
-}
-
-static bool pb_field_next(pb_field_iterator_t *iter)
-{
-    bool notwrapped = true;
-    size_t prev_size = iter->current->data_size;
-    
-    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->current->tag == 0)
-    {
-        iter->current = iter->start;
-        iter->field_index = 0;
-        iter->required_field_index = 0;
-        iter->pData = iter->dest_struct;
-        prev_size = 0;
-        notwrapped = false;
-    }
-    
-    iter->pData = (char*)iter->pData + prev_size + iter->current->data_offset;
-    iter->pSize = (char*)iter->pData + iter->current->size_offset;
-    return notwrapped;
-}
-
-static bool checkreturn pb_field_find(pb_field_iterator_t *iter, int tag)
-{
-    int start = iter->field_index;
-    
-    do {
-        if (iter->current->tag == tag)
-            return true;
-        pb_field_next(iter);
-    } while (iter->field_index != start);
-    
-    return false;
-}
-
 /*************************
 * Decode a single field *
 *************************/

 static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_type, pb_field_iterator_t *iter)
 {
-    pb_decoder_t func = PB_DECODERS[PB_LTYPE(iter->current->type)];
+    pb_decoder_t func = PB_DECODERS[PB_LTYPE(iter->current.type)];
    
-    switch (PB_HTYPE(iter->current->type))
+    switch (PB_HTYPE(iter->current.type))
    {
        case PB_HTYPE_REQUIRED:
-            return func(stream, iter->current, iter->pData);
+            return func(stream, &iter->current, iter->pData);
            
        case PB_HTYPE_OPTIONAL:
            *(bool*)iter->pSize = true;
-            return func(stream, iter->current, iter->pData);
+            return func(stream, &iter->current, iter->pData);
    
        case PB_HTYPE_ARRAY:
            if (wire_type == PB_WT_STRING
-                && PB_LTYPE(iter->current->type) <= PB_LTYPE_LAST_PACKABLE)
+                && PB_LTYPE(iter->current.type) <= PB_LTYPE_LAST_PACKABLE)
            {
                /* Packed array */
                size_t *size = (size_t*)iter->pSize;
@@ -293,10 +210,10 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                if (!make_string_substream(stream, &substream))
                    return false;
                
-                while (substream.bytes_left && *size < iter->current->array_size)
+                while (substream.bytes_left && *size < iter->current.array_size)
                {
-                    void *pItem = (uint8_t*)iter->pData + iter->current->data_size * (*size);
-                    if (!func(&substream, iter->current, pItem))
+                    void *pItem = (uint8_t*)iter->pData + iter->current.data_size * (*size);
+                    if (!func(&substream, &iter->current, pItem))
                        return false;
                    (*size)++;
                }
@@ -306,12 +223,12 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
            {
                /* Repeated field */
                size_t *size = (size_t*)iter->pSize;
-                void *pItem = (uint8_t*)iter->pData + iter->current->data_size * (*size);
-                if (*size >= iter->current->array_size)
+                void *pItem = (uint8_t*)iter->pData + iter->current.data_size * (*size);
+                if (*size >= iter->current.array_size)
                    return false;
                
                (*size)++;
-                return func(stream, iter->current, pItem);
+                return func(stream, &iter->current, pItem);
            }
        
        case PB_HTYPE_CALLBACK:
@@ -319,7 +236,7 @@ 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 pb_skip_field(stream, wire_type);
+                return skip(stream, wire_type);
            
            if (wire_type == PB_WT_STRING)
            {
@@ -330,7 +247,7 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                
                while (substream.bytes_left)
                {
-                    if (!pCallback->funcs.decode(&substream, iter->current, pCallback->arg))
+                    if (!pCallback->funcs.decode(&substream, &iter->current, pCallback->arg))
                        return false;
                }
                
@@ -351,7 +268,7 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
                    return false;
                substream = pb_istream_from_buffer(buffer, size);
                
-                return pCallback->funcs.decode(&substream, iter->current, pCallback->arg);
+                return pCallback->funcs.decode(&substream, &iter->current, pCallback->arg);
            }
        }
        
@@ -361,44 +278,44 @@ static bool checkreturn decode_field(pb_istream_t *stream, pb_wire_type_t wire_t
 }

 /* Initialize message fields to default values, recursively */
-static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_struct)
+static void pb_message_set_to_defaults(const pb_field_info_t *fields, void *dest_struct)
 {
    pb_field_iterator_t iter;
+
+    if (fields->field_keys == NULL) return;
+
    pb_field_init(&iter, fields, dest_struct);
    
    /* Initialize size/has fields and apply default values */
    do
    {
-        if (iter.current->tag == 0)
-            continue;
-        
        /* Initialize the size field for optional/repeated fields to 0. */
-        if (PB_HTYPE(iter.current->type) == PB_HTYPE_OPTIONAL)
+        if (PB_HTYPE(iter.current.type) == PB_HTYPE_OPTIONAL)
        {
            *(bool*)iter.pSize = false;
        }
-        else if (PB_HTYPE(iter.current->type) == PB_HTYPE_ARRAY)
+        else if (PB_HTYPE(iter.current.type) == PB_HTYPE_ARRAY)
        {
            *(size_t*)iter.pSize = 0;
            continue; /* Array is empty, no need to initialize contents */
        }
        
        /* Initialize field contents to default value */
-        if (PB_HTYPE(iter.current->type) == PB_HTYPE_CALLBACK)
+        if (PB_HTYPE(iter.current.type) == PB_HTYPE_CALLBACK)
        {
            continue; /* Don't overwrite callback */
        }
-        else if (PB_LTYPE(iter.current->type) == PB_LTYPE_SUBMESSAGE)
+        else if (PB_LTYPE(iter.current.type) == PB_LTYPE_SUBMESSAGE)
        {
-            pb_message_set_to_defaults(iter.current->ptr, iter.pData);
+            pb_message_set_to_defaults(iter.current.ptr, iter.pData);
        }
-        else if (iter.current->ptr != NULL)
+        else if (iter.current.ptr != NULL)
        {
-            memcpy(iter.pData, iter.current->ptr, iter.current->data_size);
+            memcpy(iter.pData, iter.current.ptr, iter.current.data_size);
        }
        else
        {
-            memset(iter.pData, 0, iter.current->data_size);
+            memset(iter.pData, 0, iter.current.data_size);
        }
    } while (pb_field_next(&iter));
 }
@@ -407,10 +324,12 @@ static void pb_message_set_to_defaults(const pb_field_t fields[], void *dest_str
 * Decode all fields *
 *********************/

-bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct)
+bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_info_t *fields, void *dest_struct)
 {
-    uint8_t fields_seen[(PB_MAX_REQUIRED_FIELDS + 7) / 8] = {}; /* Used to check for required fields */
+    uint32_t fields_seen = 0; /* Used to check for required fields */
    pb_field_iterator_t iter;
+    const pb_field_key_t *field_keys = fields->field_keys;
+    int i;
    
    pb_message_set_to_defaults(fields, dest_struct);
    
@@ -418,46 +337,47 @@ bool checkreturn pb_decode(pb_istream_t *stream, const pb_field_t fields[], void
    
    while (stream->bytes_left)
    {
+        uint32_t temp;
        int tag;
        pb_wire_type_t wire_type;
-        bool eof;
-        
-        if (!pb_decode_tag(stream, &wire_type, &tag, &eof))
+        if (!pb_decode_varint32(stream, &temp))
        {
-            if (eof)
-                break;
+            if (stream->bytes_left == 0)
+                break; /* It was EOF */
            else
-                return false;
+                return false; /* It was error */
        }
        
+        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 (!pb_skip_field(stream, wire_type))
+            if (!skip(stream, wire_type))
                return false;
            continue;
        }
        
-        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);
-        }
+        fields_seen |= 1 << (iter.field_index & 31);
            
        if (!decode_field(stream, wire_type, &iter))
            return false;
    }
    
-    /* Check that all required fields were present. */
-    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))))
+    /* Check that all required fields (mod 31) were present. */
+    for (i = 0; field_keys != NULL; i++)
+    {
+        if (PB_HTYPE(PB_FIELD_INFO(&field_keys[i], fields->field_info)->type) == PB_HTYPE_REQUIRED &&
+            !(fields_seen & (1 << (i & 31))))
        {
            return false;
        }
-    } while (pb_field_next(&iter));
+        if (PB_IS_LAST(&field_keys[i])) break;
+    }
    
    return true;
 }
@@ -474,7 +394,6 @@ static void endian_copy(void *dest, void *src, size_t destsize, size_t srcsize)
 #ifdef __BIG_ENDIAN__
    memcpy(dest, (char*)src + (srcsize - destsize), destsize);
 #else
-    UNUSED(srcsize);
    memcpy(dest, src, destsize);
 #endif
 }
@@ -502,15 +421,11 @@ bool checkreturn pb_dec_fixed32(pb_istream_t *stream, const pb_field_t *field, v
    uint8_t bytes[4] = {0};
    bool status = pb_read(stream, bytes, 4);
    if (status) {
-        uint8_t *d = (uint8_t*)dest;
-        d[0] = bytes[3];
-        d[1] = bytes[2];
-        d[2] = bytes[1];
-        d[3] = bytes[0];
+      uint8_t bebytes[4] = {bytes[3], bytes[2], bytes[1], bytes[0]};
+      memcpy(dest, bebytes, 4);
    }
    return status;
 #else
-    UNUSED(field);
    return pb_read(stream, (uint8_t*)dest, 4);
 #endif
 }
@@ -521,19 +436,12 @@ bool checkreturn pb_dec_fixed64(pb_istream_t *stream, const pb_field_t *field, v
    uint8_t bytes[8] = {0};
    bool status = pb_read(stream, bytes, 8);
    if (status) {
-        uint8_t *d = (uint8_t*)dest;
-        d[0] = bytes[7];
-        d[1] = bytes[6];
-        d[2] = bytes[5]; 
-        d[3] = bytes[4];
-        d[4] = bytes[3];
-        d[5] = bytes[2];
-        d[6] = bytes[1];
-        d[7] = bytes[0];
+      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
-    UNUSED(field);
    return pb_read(stream, (uint8_t*)dest, 8);
 #endif
 }
@@ -561,8 +469,7 @@ bool checkreturn pb_dec_string(pb_istream_t *stream, const pb_field_t *field, vo
    if (!pb_decode_varint32(stream, &size))
        return false;
    
-    /* Check length, noting the null terminator */
-    if (size + 1 > field->data_size)
+    if ((int) size > field->data_size - 1)
        return false;
    
    status = pb_read(stream, (uint8_t*)dest, size);
@@ -581,7 +488,7 @@ bool checkreturn pb_dec_submessage(pb_istream_t *stream, const pb_field_t *field
    if (field->ptr == NULL)
        return false;
    
-    status = pb_decode(&substream, (pb_field_t*)field->ptr, dest);
+    status = pb_decode(&substream, (pb_field_info_t*)field->ptr, dest);
    stream->state = substream.state;
    return status;
 }
--- a/pb_decode.h
+++ b/pb_decode.h
@@ -42,15 +42,12 @@ bool pb_read(pb_istream_t *stream, uint8_t *buf, size_t count);
 * Returns true on success, false on any failure.
 * The actual struct pointed to by dest must match the description in fields.
 */
-bool pb_decode(pb_istream_t *stream, const pb_field_t fields[], void *dest_struct);
+bool pb_decode(pb_istream_t *stream, const pb_field_info_t *fields, void *dest_struct);

 /* --- Helper functions ---
 * You may want to use these from your caller or callbacks.
 */

-bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, int *tag, bool *eof);
-bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
-
 bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);

 bool pb_skip_varint(pb_istream_t *stream);
@@ -71,4 +68,6 @@ 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);

+#define PB_ISTREAM_INIT {0,0,0}
+
 #endif
--- a/pb_encode.c
+++ b/pb_encode.c
@@ -3,7 +3,6 @@
 * 2011 Petteri Aimonen <jpa@kapsi.fi>
 */

-#define NANOPB_INTERNALS
 #include "pb.h"
 #include "pb_encode.h"
 #include <string.h>
@@ -99,7 +98,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 = PB_OSTREAM_INIT;
            p = pData;
            for (i = 0; i < count; i++)
            {
@@ -110,7 +109,7 @@ static bool checkreturn encode_array(pb_ostream_t *stream, const pb_field_t *fie
            size = sizestream.bytes_written;
        }
        
-        if (!pb_encode_varint(stream, (uint64_t)size))
+        if (!pb_encode_varint(stream, size))
            return false;
        
        if (stream->callback == NULL)
@@ -141,15 +140,19 @@ 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_field_t fields[], const void *src_struct)
+bool checkreturn pb_encode(pb_ostream_t *stream, const pb_field_info_t *fields, const void *src_struct)
 {
-    const pb_field_t *field = fields;
+    const pb_field_t *field;
+    const pb_field_key_t *field_key = fields->field_keys;
    const void *pData = src_struct;
    const void *pSize;
    size_t prev_size = 0;
    
-    while (field->tag != 0)
+    while(field_key != NULL)
    {
+        pb_field_t f = *(PB_FIELD_INFO(field_key, fields->field_info));
+        f.tag = PB_TAG_VAL(field_key);
+        field = &f;
        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;
@@ -194,13 +197,20 @@ bool checkreturn pb_encode(pb_ostream_t *stream, const pb_field_t fields[], cons
                break;
            }
        }
-    
-        field++;
+        if (PB_IS_LAST(field_key++)) break;
    }
    
    return true;
 }

+int checkreturn pb_get_message_size(const pb_field_info_t *fields, const void *src_struct)
+{
+    pb_ostream_t ostream = PB_OSTREAM_INIT;
+    if (pb_encode(&ostream, fields, src_struct))
+        return ostream.bytes_written;
+    return -1;
+}
+
 /* Helper functions */
 bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
 {
@@ -212,7 +222,7 @@ bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
    
    while (value)
    {
-        buffer[i] = (uint8_t)((value & 0x7F) | 0x80);
+        buffer[i] = (value & 0x7F) | 0x80;
        value >>= 7;
        i++;
    }
@@ -221,55 +231,10 @@ bool checkreturn pb_encode_varint(pb_ostream_t *stream, uint64_t value)
    return pb_write(stream, buffer, i);
 }

-bool checkreturn pb_encode_svarint(pb_ostream_t *stream, int64_t value)
-{
-    uint64_t zigzagged;
-    if (value < 0)
-        zigzagged = ~(value << 1);
-    else
-        zigzagged = 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, (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, (uint8_t*)value, 8);
-    #endif
-}
-
 bool checkreturn pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, int field_number)
 {
    int tag = wiretype | (field_number << 3);
-    return pb_encode_varint(stream, (uint64_t)tag);
+    return pb_encode_varint(stream, tag);
 }

 bool checkreturn pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_t *field)
@@ -305,25 +270,105 @@ 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, (uint64_t)size))
+    if (!pb_encode_varint(stream, size))
        return false;
    
    return pb_write(stream, buffer, size);
 }

-bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fields[], const void *src_struct)
+/* 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)
 {
-    /* First calculate the message size using a non-writing substream. */
-    pb_ostream_t substream = {0};
+#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)
+{
+    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)
+{
+    return pb_encode_string(stream, (uint8_t*)src, strlen((char*)src));
+}
+
+bool checkreturn pb_enc_submessage(pb_ostream_t *stream, const pb_field_t *field, const void *src)
+{
+    pb_ostream_t substream = {0, 0, 0, 0};
    size_t size;
    bool status;
    
-    if (!pb_encode(&substream, fields, src_struct))
+    if (field->ptr == NULL)
+        return false;
+    
+    if (!pb_encode(&substream, (pb_field_info_t*)field->ptr, src))
        return false;
    
    size = substream.bytes_written;
    
-    if (!pb_encode_varint(stream, (uint64_t)size))
+    if (!pb_encode_varint(stream, size))
        return false;
    
    if (stream->callback == NULL)
@@ -339,7 +384,7 @@ bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
    substream.max_size = size;
    substream.bytes_written = 0;
    
-    status = pb_encode(&substream, fields, src_struct);
+    status = pb_encode(&substream, (pb_field_info_t*)field->ptr, src);
    
    stream->bytes_written += substream.bytes_written;
    stream->state = substream.state;
@@ -350,68 +395,3 @@ bool checkreturn pb_encode_submessage(pb_ostream_t *stream, const pb_field_t fie
    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 = *(uint8_t*)src; break;
-        case 2: value = *(uint16_t*)src; break;
-        case 4: value = *(uint32_t*)src; break;
-        case 8: value = *(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)
-{
-    uint64_t value = 0;
-    
-    switch (field->data_size)
-    {
-        case 4: value = *(int32_t*)src; break;
-        case 8: value = *(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)
-{
-    pb_bytes_array_t *bytes = (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, (uint8_t*)src, strlen((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, (pb_field_t*)field->ptr, src);
-}
-
--- a/pb_encode.h
+++ b/pb_encode.h
@@ -42,62 +42,34 @@ bool pb_write(pb_ostream_t *stream, const uint8_t *buf, size_t count);
 * 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_field_t fields[], const void *src_struct);
+bool pb_encode(pb_ostream_t *stream, const pb_field_info_t *fields, const void *src_struct);
+
+int pb_get_message_size(const pb_field_info_t *fields, const void *src_struct);

 /* --- Helper functions ---
 * You may want to use these from your caller or callbacks.
 */

-/* 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);
-
-/* 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, int 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_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. */
+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. */
 bool pb_encode_string(pb_ostream_t *stream, const uint8_t *buffer, size_t size);

-/* 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.
+/* --- Field encoders ---
+ * Each encoder writes the content for the field.
+ * The tag/wire type has been written already.
 */

-#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);

-
+#define PB_OSTREAM_INIT {0,0,0,0}
 #endif
--- a/pb_field.c
+++ b/pb_field.c
@@ -0,0 +1,98 @@
+#include "pb_field.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
+
+/**
+ * pb_common_aligned_field_info array holds the common field info that can be shared
+ * by any numeric fields whose previous field is memory aligned
+ */
+const pb_field_t pb_common_aligned_field_info[NUM_COMMON_FIELD_INFO] = {
+	/* REQUIRED bool */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_VARINT, 0, 0, sizeof(bool), 0, 0},
+    /* OPTIONAL bool */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_VARINT, 1, -1, sizeof(bool), 0, 0},
+	/* REQUIRED int32, uint32, enum */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_VARINT, 0, 0, sizeof(uint32_t), 0, 0},
+    /* OPTIONAL int32, uint32, enum */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_VARINT, 4, -4, sizeof(uint32_t), 0, 0},
+	/* REQUIRED int64, uint64 */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_VARINT, 0, 0, sizeof(uint64_t), 0, 0},
+    /* OPTIONAL int64, uint64 */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_VARINT, 4, -4, sizeof(uint64_t), 0, 0},
+    /* REQUIRED sint32 */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_SVARINT, 0, 0, sizeof(int32_t), 0, 0},
+    /* OPTIONAL sint32 */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_SVARINT, 4, -4, sizeof(int32_t), 0, 0},
+    /* REQUIRED sint64 */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_SVARINT, 0, 0, sizeof(int64_t), 0, 0},
+    /* OPTIONAL sint64 */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_SVARINT, 4, -4, sizeof(int64_t), 0, 0},
+    /* REQUIRED fixed32, sfixed32, float */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_FIXED32, 0, 0, sizeof(uint32_t), 0, 0},
+    /* OPTIONAL fixed32, sfixed32, float */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_FIXED32, 4, -4, sizeof(uint32_t), 0, 0},
+    /* REQUIRED fixed64, sfixed64, double */
+    {0, PB_HTYPE_REQUIRED | PB_LTYPE_FIXED64, 0, 0, sizeof(uint64_t), 0, 0},
+    /* OPTIONAL fixed64, sfixed64, double */
+    {0, PB_HTYPE_OPTIONAL | PB_LTYPE_FIXED64, 4, -4, sizeof(uint64_t), 0, 0}
+};
+
+void pb_field_init(pb_field_iterator_t *iter, const pb_field_info_t *fields, void *dest_struct)
+{
+    if (fields->field_keys == NULL) return;
+    iter->start_key = iter->current_key = fields->field_keys;
+    iter->field_info = fields->field_info;
+    iter->current = *(PB_FIELD_INFO(iter->current_key, iter->field_info));
+    iter->current.tag = PB_TAG_VAL(iter->current_key);
+    iter->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;
+}
+
+bool pb_field_next(pb_field_iterator_t *iter)
+{
+    bool notwrapped = true;
+    size_t prev_size = iter->current.data_size;
+
+    if (PB_HTYPE(iter->current.type) == PB_HTYPE_ARRAY)
+        prev_size *= iter->current.array_size;
+
+    iter->field_index++;
+    if (PB_IS_LAST(iter->current_key))
+    {
+        iter->current_key = iter->start_key;
+        iter->current = *(PB_FIELD_INFO(iter->current_key, iter->field_info));
+        iter->current.tag = PB_TAG_VAL(iter->current_key);
+        iter->field_index = 0;
+        iter->pData = iter->dest_struct;
+        prev_size = 0;
+        notwrapped = false;
+    } else {
+        iter->current_key++;
+        iter->current = *(PB_FIELD_INFO(iter->current_key, iter->field_info));
+        iter->current.tag = PB_TAG_VAL(iter->current_key);
+    }
+
+    iter->pData = (char*)iter->pData + prev_size + iter->current.data_offset;
+    iter->pSize = (char*)iter->pData + iter->current.size_offset;
+    return notwrapped;
+}
+
+bool checkreturn pb_field_find(pb_field_iterator_t *iter, int tag)
+{
+    int start = iter->field_index;
+
+    do {
+        if (iter->current.tag == tag)
+            return true;
+        pb_field_next(iter);
+    } while (iter->field_index != start);
+
+    return false;
+}
--- a/pb_field.h
+++ b/pb_field.h
@@ -0,0 +1,211 @@
+#ifndef _PB_FIELD_H_
+#define _PB_FIELD_H_
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+
+#ifdef __GNUC__
+/* This just reduces memory requirements, but is not required. */
+#define pb_packed __attribute__((packed))
+#else
+#define pb_packed
+#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.
+ *
+ * INT32 and UINT32 are treated the same, as are (U)INT64 and (S)FIXED*
+ * These types are simply casted to correct field type when they are
+ * assigned to the memory pointer.
+ * SINT* is different, though, because it is zig-zag coded.
+ */
+
+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,
+
+    /******************
+     * 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_packed pb_type_t;
+
+#define PB_HTYPE(x) ((x) & 0xF0)
+#define PB_LTYPE(x) ((x) & 0x0F)
+
+/* This structure is used for 'bytes' arrays.
+ * 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 {
+    size_t size;
+    uint8_t bytes[1];
+} pb_bytes_array_t;
+
+/* The next three pb_field_ structures are used in auto-generated constants
+ * to specify struct fields.
+ */
+
+typedef struct _pb_field_key_t pb_field_key_t;
+typedef struct _pb_field_t pb_field_t;
+typedef struct _pb_field_info_t pb_field_info_t;
+/* pb_field_key_t is a structure for storing the tag and an index into an array
+ * that stores the actual field info. This approach is used to reduce code size
+ * as many numeric fields have the same field info.
+ *
+ * A uint8_t tag will limit the field tag to 128 as the MSB bit is used to indicate
+ * whether or not it's the last field in the message. You may change it to uint16_t
+ * if you want to specify larger field tag. Please also change the corresponding
+ * tag in pb_field_t
+ */
+typedef uint8_t tag_t;
+struct _pb_field_key_t {
+    tag_t tag;     /* The MSB bit of the tag is used to indicate it's the last field in the message */
+    /* The MSB bit of the info_index is used to indicate the field info is retrieved
+     * from the global pb_common_aligned_field_info array instead of the auto-generated field
+     * info.
+     */
+    uint8_t info_index;
+} pb_packed;
+
+/* pb_field_t is a structure for storing the pb field descriptor information
+ * You can change field sizes here if you need structures
+ * larger than 256 bytes
+ */
+struct _pb_field_t {
+    tag_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 */
+
+    /* Field definitions for submessage
+     * OR default value for all other non-array, non-callback types
+     * If null, then field will zeroed. */
+    const void *ptr;
+} pb_packed;
+
+/* pb_field_info_t is the structure for holding together the key and the field info arrays.
+ * This is the structure that will be passed to pb_encode and pb_decode
+ */
+struct _pb_field_info_t {
+    const pb_field_key_t *field_keys;
+    const pb_field_t *field_info;
+};
+
+/* Iterator for pb_field_t list */
+typedef struct {
+    const pb_field_key_t *start_key;
+    const pb_field_key_t *current_key;
+    pb_field_t current;
+    const pb_field_t *field_info;
+    int field_index;
+    void *dest_struct;
+    void *pData;
+    void *pSize;
+} pb_field_iterator_t;
+
+/* Functions for iterating through the field */
+void pb_field_init(pb_field_iterator_t *iter, const pb_field_info_t *fields, void *dest_struct);
+bool pb_field_next(pb_field_iterator_t *iter);
+bool pb_field_find(pb_field_iterator_t *iter, int tag);
+
+/* These macros are used to declare pb_field_t's in the constant array. */
+#define pb_membersize(st, m) (sizeof ((st*)0)->m)
+#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))
+
+/* The MSB bit of the pb_field_key_t.tag indicates whether or not it's the last element */
+#define PB_LAST_FIELD (0x1 << (pb_membersize(pb_field_key_t, tag) * 8 - 1))
+#define PB_IS_LAST(key) ((key)->tag & PB_LAST_FIELD)
+#define PB_TAG_VAL(key) ((key)->tag & ~PB_LAST_FIELD)
+
+/* The MSB bit of the pb_field_key_tag.info_index indicates whether it's a common or generated field info */
+#define PB_COMMON_INFO_FLAG (0x1 << (pb_membersize(pb_field_key_t, info_index) * 8 -1))
+
+/* A common field info is retrieved from the globally declared pb_common_aligned_field_info array or
+ * locally auto-generated field info array */
+#define PB_FIELD_INFO(key, info) (((key)->info_index & PB_COMMON_INFO_FLAG) ? \
+    &pb_common_aligned_field_info[(key)->info_index ^ PB_COMMON_INFO_FLAG] : \
+    &((info)[(key)->info_index]))
+
+/* Defines the indices for pb_common_aligned_field_info array
+ * Note that MSB bit PB_COMMON_INFO_FLAG is set to indicate the index
+ * should be used on pb_common_aligned_field_info instead of generated
+ * array
+ * */
+enum {
+    REQUIRED_BOOL_INFO = 0 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_BOOL_INFO = 1 | PB_COMMON_INFO_FLAG,
+    REQUIRED_INT32_INFO = 2 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_INT32_INFO = 3 | PB_COMMON_INFO_FLAG,
+    REQUIRED_INT64_INFO = 4 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_INT64_INFO = 5 | PB_COMMON_INFO_FLAG,
+    REQUIRED_SINT32_INFO = 6 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_SINT32_INFO = 7 | PB_COMMON_INFO_FLAG,
+    REQUIRED_SINT64_INFO = 8 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_SINT64_INFO = 9 | PB_COMMON_INFO_FLAG,
+    REQUIRED_FIXED32_INFO = 10 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_FIXED32_INFO = 11 | PB_COMMON_INFO_FLAG,
+    REQUIRED_FIXED64_INFO = 12 | PB_COMMON_INFO_FLAG,
+    OPTIONAL_FIXED64_INFO = 13 | PB_COMMON_INFO_FLAG,
+
+    /* leave this enum to determine num of elements */
+    MAX_COMMON_FIELD_INFO
+};
+
+#define NUM_COMMON_FIELD_INFO (MAX_COMMON_FIELD_INFO ^ PB_COMMON_INFO_FLAG)
+
+/* pb_common_aligned_field_info array holds the common field info that can be shared
+ * by any numeric fields whose previous field is memory aligned
+ */
+extern const pb_field_t pb_common_aligned_field_info[NUM_COMMON_FIELD_INFO];
+
+#endif /* _PB_FIELD_H_ */
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,12 +1,23 @@
 CFLAGS=-ansi -Wall -Werror -I .. -g -O0 --coverage
 LDFLAGS=--coverage
-DEPS=../pb_decode.h ../pb_encode.h ../pb.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h alltypes.pb.h missing_fields.pb.h
-TESTS=test_decode1 test_encode1 decode_unittests encode_unittests test_no_messages
+DEPS=../pb_decode.h ../pb_encode.h ../pb.h ../pb_field.h person.pb.h callbacks.pb.h unittests.h unittestproto.pb.h alltypes.pb.h aligntype.pb.h
+TESTS=test_decode1 test_encode1 test_encode2 test_decode2 test_encode3 test_decode3 test_encode4 test_decode4 decode_unittests encode_unittests test_encode_callbacks test_decode_callbacks
+
+CC_VER := $(shell gcc --version | grep gcc)
+ifneq "$(CC_VER)" ""
+CFLAGS += -m32
+LDFLAGS += -m32
+endif
+ifndef PB_PATH
+PBPATHOPT=-I/usr/include -I/usr/local/include
+else
+PBPATHOPT=-I$(PB_PATH)
+endif

 all: breakpoints $(TESTS) run_unittests

 clean:
-	rm -f $(TESTS) person.pb* alltypes.pb* *.o *.gcda *.gcno
+	rm -f breakpoints $(TESTS) *.pb *.pb.c *.pb.h *.o *.gcda *.gcno

 %.o: %.c
 %.o: %.c $(DEPS)
@@ -16,22 +27,24 @@ pb_encode.o: ../pb_encode.c $(DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
 pb_decode.o: ../pb_decode.c $(DEPS)
 	$(CC) $(CFLAGS) -c -o $@ $<
+pb_field.o: ../pb_field.c $(DEPS)
+	$(CC) $(CFLAGS) -c -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_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
-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
+test_decode1: test_decode1.o pb_decode.o pb_field.o person.pb.o
+test_decode2: test_decode2.o pb_decode.o pb_field.o person.pb.o
+test_decode3: test_decode3.o pb_decode.o pb_field.o alltypes.pb.o
+test_decode4: test_decode4.o pb_decode.o pb_field.o aligntype.pb.o
+test_encode1: test_encode1.o pb_encode.o pb_field.o person.pb.o
+test_encode2: test_encode2.o pb_encode.o pb_field.o person.pb.o
+test_encode3: test_encode3.o pb_encode.o pb_field.o alltypes.pb.o
+test_encode4: test_encode4.o pb_encode.o pb_field.o aligntype.pb.o
+test_decode_callbacks: test_decode_callbacks.o pb_decode.o pb_field.o callbacks.pb.o
+test_encode_callbacks: test_encode_callbacks.o pb_encode.o pb_field.o callbacks.pb.o
+decode_unittests: decode_unittests.o pb_decode.o pb_field.o unittestproto.pb.o
+encode_unittests: encode_unittests.o pb_encode.o pb_field.o unittestproto.pb.o

 %.pb: %.proto
-	protoc -I. -I../generator -I/usr/include -o$@ $<
+	protoc -I. -I../generator $(PBPATHOPT) -o$@ $<

 %.pb.c %.pb.h: %.pb ../generator/nanopb_generator.py
 	python ../generator/nanopb_generator.py $<
@@ -43,28 +56,29 @@ coverage: run_unittests
 	gcov pb_encode.gcda
 	gcov pb_decode.gcda

-run_unittests: decode_unittests encode_unittests test_encode1 test_encode2 test_encode3 test_decode1 test_decode2 test_decode3 test_encode_callbacks test_decode_callbacks test_missing_fields
+run_unittests: $(TESTS)
 	rm -f *.gcda
 	
 	./decode_unittests > /dev/null
 	./encode_unittests > /dev/null
 	
 	[ "`./test_encode1 | ./test_decode1`" = \
-	"`./test_encode1 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+	"`./test_encode1 | protoc --decode=Person -I. -I../generator $(PBPATHOPT) person.proto`" ]

 	[ "`./test_encode2 | ./test_decode1`" = \
-	"`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+	"`./test_encode2 | protoc --decode=Person -I. -I../generator $(PBPATHOPT) person.proto`" ]

 	[ "`./test_encode2 | ./test_decode2`" = \
-	"`./test_encode2 | protoc --decode=Person -I. -I../generator -I/usr/include person.proto`" ]
+	"`./test_encode2 | protoc --decode=Person -I. -I../generator $(PBPATHOPT) person.proto`" ]
 	
 	[ "`./test_encode_callbacks | ./test_decode_callbacks`" = \
 	"`./test_encode_callbacks | protoc --decode=TestMessage callbacks.proto`" ]

 	./test_encode3 | ./test_decode3
-	./test_encode3 | protoc --decode=AllTypes -I. -I../generator -I/usr/include alltypes.proto >/dev/null
+	./test_encode3 | protoc --decode=AllTypes -I. -I../generator $(PBPATHOPT) alltypes.proto >/dev/null

-	./test_missing_fields
+	./test_encode4 | ./test_decode4
+	./test_encode4 | protoc --decode=AlignTypes -I. -I../generator $(PBPATHOPT) aligntype.proto >/dev/null

 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'
--- a/tests/aligntype.proto
+++ b/tests/aligntype.proto
@@ -0,0 +1,80 @@
+import "nanopb.proto";
+
+message SubMessage {
+    required string substuff1 = 1 [(nanopb).max_size = 16];
+    required int32 substuff2 = 2;
+}
+
+enum MyEnum {
+    First = 1;
+    Second = 2;
+    Truth = 42;
+}
+
+message AlignTypes {
+    required bool       req_bool    = 1;
+    required int32      req_int32   = 2;
+    required SubMessage req_submsg  = 3;
+    required int64      req_int64   = 4;
+    required string     req_string  = 5 [(nanopb).max_size = 16];
+    required MyEnum     req_enum    = 6;
+    required bytes      req_bytes   = 7 [(nanopb).max_size = 16];
+    required sint32     req_sint32  = 8;
+    required bool       req_bool_2  = 9;
+    required sint64     req_sint64  = 10;
+    required bool       req_bool_3  = 11;
+    required fixed32    req_fixed32 = 12;
+    required bool       req_bool_4  = 13;
+    required fixed64    req_fixed64 = 14;
+    required bool       req_bool_5  = 15;
+    required float      req_float   = 16;
+    required bool       req_bool_6  = 17;
+    required double     req_double  = 18;
+
+    optional bool       opt_bool    = 19;
+    optional int32      opt_int32   = 20;
+    optional SubMessage opt_submsg  = 21;
+    optional int64      opt_int64   = 22;
+    optional string     opt_string  = 23 [(nanopb).max_size = 16];
+    optional MyEnum     opt_enum    = 24;
+    optional bytes      opt_bytes   = 25 [(nanopb).max_size = 16];
+    optional sint32     opt_sint32  = 26;
+    optional bool       opt_bool_2  = 27;
+    optional sint64     opt_sint64  = 28;
+    optional bool       opt_bool_3  = 29;
+    optional fixed32    opt_fixed32 = 30;
+    optional bool       opt_bool_4  = 31;
+    optional fixed64    opt_fixed64 = 32;
+    optional bool       opt_bool_5  = 33;
+    optional float      opt_float   = 34;
+    optional bool       opt_bool_6  = 35;
+    optional double     opt_double  = 36;
+
+    required bool       req_bool_aligned    = 37; 
+    required int32      req_int32_aligned   = 38;
+    required int64      req_int64_aligned   = 39;
+    required MyEnum     req_enum_aligned    = 40;
+    required sint32     req_sint32_aligned  = 41;
+    required sint64     req_sint64_aligned  = 42;
+    required fixed32    req_fixed32_aligned = 43;
+    required fixed64    req_fixed64_aligned = 44;
+    required float      req_float_aligned   = 45;
+    required double     req_double_aligned  = 46;
+
+    optional bool       opt_bool_aligned    = 47;
+    optional int32      opt_int32_aligned   = 48;
+    optional int64      opt_int64_aligned   = 49;
+    optional MyEnum     opt_enum_aligned    = 50;
+    optional sint32     opt_sint32_aligned  = 51;
+    optional sint64     opt_sint64_aligned  = 52;
+    optional fixed32    opt_fixed32_aligned = 53;
+    optional fixed64    opt_fixed64_aligned = 54;
+    optional float      opt_float_aligned   = 55;
+    optional double     opt_double_aligned  = 56;
+
+
+    // 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;
+}
+
--- a/tests/encode_unittests.c
+++ b/tests/encode_unittests.c
@@ -1,5 +1,3 @@
-#define NANOPB_INTERNALS
-
 #include <stdio.h>
 #include <string.h>
 #include "pb_encode.h"
@@ -125,6 +123,7 @@ int main()
        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;
@@ -133,6 +132,8 @@ 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"));
--- a/tests/missing_fields.proto
+++ b/tests/missing_fields.proto
@@ -1,138 +0,0 @@
-/* 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;
-}
-
--- a/tests/no_messages.proto
+++ b/tests/no_messages.proto
@@ -1,7 +0,0 @@
-/* Test that a file without any messages works. */
-
-enum Test {
-    First = 1;
-}
-
-
--- a/tests/test_decode4.c
+++ b/tests/test_decode4.c
@@ -0,0 +1,139 @@
+/* Tests the decoding of all types. Currently only in the 'required' variety.
+ * This is the counterpart of test_encode3.
+ * Run e.g. ./test_encode3 | ./test_decode3
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <pb_decode.h>
+#include "aligntype.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_aligntypes(pb_istream_t *stream)
+{
+    AlignTypes aligntypes = {};
+    
+    if (!pb_decode(stream, AlignTypes_fields, &aligntypes))
+        return false;
+    
+    TEST(aligntypes.req_bool          == true);
+    TEST(aligntypes.req_int32         == 1001);
+    TEST(strcmp(aligntypes.req_submsg.substuff1, "1002") == 0);
+    TEST(aligntypes.req_submsg.substuff2 == 1002);
+    TEST(aligntypes.req_int64         == 1003);
+    TEST(strcmp(aligntypes.req_string, "1004") == 0);
+    TEST(aligntypes.req_enum == MyEnum_Truth);
+    TEST(aligntypes.req_bytes.size == 4);
+    TEST(memcmp(aligntypes.req_bytes.bytes, "1005", 4) == 0);
+    TEST(aligntypes.req_sint32        == 1006);
+    TEST(aligntypes.req_bool_2        == true);
+    TEST(aligntypes.req_sint64        == 1007);
+    TEST(aligntypes.req_bool_3        == true);
+    TEST(aligntypes.req_fixed32       == 1008);
+    TEST(aligntypes.req_bool_4        == true);
+    TEST(aligntypes.req_fixed64       == 1009);
+    TEST(aligntypes.req_bool_5        == true);
+    TEST(aligntypes.req_float         == 1010.0f);
+    TEST(aligntypes.req_bool_5        == true);
+    TEST(aligntypes.req_double        == 1011.0f);
+   
+    TEST(aligntypes.has_opt_bool      == true);
+    TEST(aligntypes.opt_bool          == true);
+    TEST(aligntypes.has_opt_int32     == true);
+    TEST(aligntypes.opt_int32         == 1001);
+    TEST(aligntypes.has_opt_submsg    == true);
+    TEST(strcmp(aligntypes.opt_submsg.substuff1, "1002") == 0);
+    TEST(aligntypes.opt_submsg.substuff2 == 1002);
+    TEST(aligntypes.has_opt_int64     == true);
+    TEST(aligntypes.opt_int64         == 1003);
+    TEST(aligntypes.has_opt_string    == true);
+    TEST(strcmp(aligntypes.opt_string, "1004") == 0);
+    TEST(aligntypes.has_opt_enum      == true);
+    TEST(aligntypes.opt_enum == MyEnum_Truth);
+    TEST(aligntypes.has_opt_bytes     == true);
+    TEST(aligntypes.opt_bytes.size == 4);
+    TEST(memcmp(aligntypes.opt_bytes.bytes, "1005", 4) == 0);
+    TEST(aligntypes.has_opt_sint32    == true);
+    TEST(aligntypes.opt_sint32        == 1006);
+    TEST(aligntypes.has_opt_bool_2    == true);
+    TEST(aligntypes.opt_bool_2        == true);
+    TEST(aligntypes.has_opt_sint64    == true);
+    TEST(aligntypes.opt_sint64        == 1007);
+    TEST(aligntypes.has_opt_bool_3    == true);
+    TEST(aligntypes.opt_bool_3        == true);
+    TEST(aligntypes.has_opt_fixed32   == true);
+    TEST(aligntypes.opt_fixed32       == 1008);
+    TEST(aligntypes.has_opt_bool_4    == true);
+    TEST(aligntypes.opt_bool_4        == true);
+    TEST(aligntypes.has_opt_fixed64   == true);
+    TEST(aligntypes.opt_fixed64       == 1009);
+    TEST(aligntypes.has_opt_bool_5    == true);
+    TEST(aligntypes.opt_bool_5        == true);
+    TEST(aligntypes.has_opt_float     == true);
+    TEST(aligntypes.opt_float         == 1010.0f);
+    TEST(aligntypes.has_opt_bool_6    == true);
+    TEST(aligntypes.opt_bool_6        == true);
+    TEST(aligntypes.has_opt_double    == true);
+    TEST(aligntypes.opt_double        == 1011.0f);
+
+    TEST(aligntypes.req_bool_aligned   == true);
+    TEST(aligntypes.req_int32_aligned  == 1001);
+    TEST(aligntypes.req_int64_aligned  == 1003);
+    TEST(aligntypes.req_enum_aligned   == MyEnum_Truth);
+    TEST(aligntypes.req_sint32_aligned == 1006);
+    TEST(aligntypes.req_sint64_aligned == 1007);
+    TEST(aligntypes.req_fixed32_aligned == 1008);
+    TEST(aligntypes.req_fixed64_aligned == 1009);
+    TEST(aligntypes.req_float_aligned  == 1010.0f);
+    TEST(aligntypes.req_double_aligned == 1011.0f);
+
+    TEST(aligntypes.has_opt_bool_aligned      == true);
+    TEST(aligntypes.opt_bool_aligned          == true);
+    TEST(aligntypes.has_opt_int32_aligned     == true);
+    TEST(aligntypes.opt_int32_aligned         == 1001);
+    TEST(aligntypes.has_opt_int64_aligned     == true);
+    TEST(aligntypes.opt_int64_aligned         == 1003);
+    TEST(aligntypes.has_opt_enum_aligned      == true);
+    TEST(aligntypes.opt_enum_aligned == MyEnum_Truth);
+    TEST(aligntypes.has_opt_sint32_aligned    == true);
+    TEST(aligntypes.opt_sint32_aligned        == 1006);
+    TEST(aligntypes.has_opt_sint64_aligned    == true);
+    TEST(aligntypes.opt_sint64_aligned        == 1007);
+    TEST(aligntypes.has_opt_fixed32_aligned   == true);
+    TEST(aligntypes.opt_fixed32_aligned       == 1008);
+    TEST(aligntypes.has_opt_fixed64_aligned   == true);
+    TEST(aligntypes.opt_fixed64_aligned       == 1009);
+    TEST(aligntypes.has_opt_float_aligned     == true);
+    TEST(aligntypes.opt_float_aligned         == 1010.0f);
+    TEST(aligntypes.has_opt_double_aligned    == true);
+    TEST(aligntypes.opt_double_aligned        == 1011.0f);
+
+    TEST(aligntypes.end == 1099);
+    
+    return true;
+}
+
+int main()
+{
+    /* Read the data into buffer */
+    uint8_t buffer[512];
+    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_aligntypes(&stream))
+    {
+        printf("Parsing failed.\n");
+        return 1;
+    } else {
+        return 0;
+    }
+}
--- a/tests/test_encode4.c
+++ b/tests/test_encode4.c
@@ -0,0 +1,117 @@
+/* Attempts to test all the datatypes supported by ProtoBuf.
+ * Currently only tests the 'required' variety.
+ */
+
+#include <stdio.h>
+#include <pb_encode.h>
+#include "aligntype.pb.h"
+
+int main()
+{
+    /* Initialize the structure with constants */
+    AlignTypes aligntypes = {
+        true,
+        1001,
+        {"1002", 1002},
+        1003,
+        "1004",
+        MyEnum_Truth,
+        {4, "1005"},
+        1006,
+        true,
+        1007,
+        true,
+        1008,
+        true,
+        1009,
+        true,
+        1010.0f,
+        true,
+        1011.0f,
+
+        true,
+        true,
+        true,
+        1001,
+        true,
+        {"1002", 1002},
+        true,
+        1003,
+        true,
+        "1004",
+        true,
+        MyEnum_Truth,
+        true,
+        {4, "1005"},
+        true,
+        1006,
+        true,
+        true,
+        true,
+        1007,
+        true,
+        true,
+        true,
+        1008,
+        true,
+        true,
+        true,
+        1009,
+        true,
+        true,
+        true,
+        1010.0f,
+        true,
+        true,
+        true,
+        1011.0f,
+        
+        true,
+        1001,
+        1003,
+        MyEnum_Truth,
+        1006,
+        1007,
+        1008,
+        1009,
+        1010.0f,
+        1011.0f,
+
+        true,
+        true,
+        true,
+        1001,
+        true,
+        1003,
+        true,
+        MyEnum_Truth,
+        true,
+        1006,
+        true,
+        1007,
+        true,
+        1008,
+        true,
+        1009,
+        true,
+        1010.0f,
+        true,
+        1011.0f,
+
+        1099
+    };
+    
+    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, AlignTypes_fields, &aligntypes))
+    {
+        fwrite(buffer, 1, stream.bytes_written, stdout);
+        return 0; /* Success */
+    }
+    else
+    {
+        return 1; /* Failure */
+    }
+}
--- a/tests/test_encode_callbacks.c
+++ b/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_encode_fixed32(stream, &value);
+    return pb_enc_fixed32(stream, field, &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_encode_fixed64(stream, &value);
+    return pb_enc_fixed64(stream, field, &value);
 }

 int main()
--- a/tests/test_missing_fields.c
+++ b/tests/test_missing_fields.c
@@ -1,49 +0,0 @@
-/* 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.\n");
-            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 */
-}
-
--- a/tests/testperson.pb
+++ b/tests/testperson.pb
@@ -1,3 +0,0 @@
-
-Test Person7foobar@foobar.com"
-555-12345678
Author	SHA1	Message	Date
Daniel Kan	6d010fb7c4	Fixed pb_get_message_size	2012-02-27 14:46:38 -08:00
Daniel Kan	34aa2031c4	Code reduction optimization by sharing common field descriptor information for numeric field types	2012-02-24 13:46:36 -08:00