Diff: thinger/thinger_decoder.hpp

Revision:

4:de51256455f7

Parent:

0:b75d784c7c1a

--- a/thinger/thinger_decoder.hpp	Fri Dec 25 18:21:02 2015 +0000
+++ b/thinger/thinger_decoder.hpp	Sat Dec 26 13:18:01 2015 +0000
@@ -1,137 +1,125 @@
-// The MIT License (MIT)
-//
-// Copyright (c) 2015 THINGER LTD
-// Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-#ifndef THINGER_DECODER_HPP
-#define THINGER_DECODER_HPP
-
-#include "pson.h"
-#include "thinger_io.hpp"
-#include "thinger_message.hpp"
-
-namespace thinger{
-
-    class thinger_decoder : public protoson::pson_decoder{
-    public:
-        void decode(thinger_message&  message, size_t size){
-            size_t start_read = bytes_read();
-            while(size-(bytes_read()-start_read)>0) {
-                protoson::pb_wire_type wire_type;
-                uint32_t field_number;
-                pb_decode_tag(wire_type, field_number);
-                switch (wire_type) {
-                    case protoson::length_delimited:{
-                        uint32_t size = pb_decode_varint32();
-                        void *data = NULL;
-                        switch (field_number) {
-                            /*
-                            case thinger_message::THING_ID:
-                                data = protoson::pool.allocate(size + 1);
-                                pb_read_string((char *) data, size);
-                                message.set_thing_id((const char *) data);
-                                break;
-                            */
-                            default:
-                                pb_skip(size);
-                                break;
-                        }
-                    }
-                        break;
-                    case protoson::varint: {
-                        switch (field_number) {
-                            case thinger_message::SIGNAL_FLAG:
-                                message.set_signal_flag((thinger_message::signal_flag)pb_decode_varint32());
-                                break;
-                            case thinger_message::STREAM_ID:
-                                message.set_stream_id(pb_decode_varint32());
-                                break;
-                            default:
-                                pb_skip_varint();
-                                break;
-                        }
-                        break;
-                    }
-                    case protoson::pson_type:
-                        switch(field_number){
-                            case thinger_message::RESOURCE:
-                                protoson::pson_decoder::decode(message.get_resources());
-                                break;
-                            case thinger_message::PSON_PAYLOAD:
-                                protoson::pson_decoder::decode(((protoson::pson&) message));
-                                break;
-                            default:
-                                break;
-                        }
-                        break;
-                    case protoson::fixed_32:
-                        pb_skip(4);
-                        break;
-                    case protoson::fixed_64:
-                        pb_skip(8);
-                        break;
-                    default:
-                        break;
-                }
-            }
-        }
-    };
-
-    class thinger_read_decoder : public thinger_decoder{
-    public:
-        thinger_read_decoder(thinger_io& io) : io_(io)
-        {}
-
-    protected:
-        virtual bool read(void* buffer, size_t size){
-            io_.read((char*)buffer, size);
-            protoson::pson_decoder::read(buffer, size);
-            return true;
-        }
-
-    private:
-        thinger_io& io_;
-    };
-
-    class thinger_memory_decoder : public thinger_decoder{
-
-    public:
-        thinger_memory_decoder(uint8_t* buffer, size_t size) : buffer_(buffer), size_(size){}
-
-    protected:
-        virtual bool read(void* buffer, size_t size){
-            if(read_+size<=size_){
-                memcpy(buffer, buffer_ + read_, size);
-                return protoson::pson_decoder::read(buffer, size);
-            }else{
-                return false;
-            }
-        }
-
-    private:
-        uint8_t* buffer_;
-        size_t size_;
-
-    };
-
-}
-
-#endif
+// The MIT License (MIT)
+//
+// Copyright (c) 2015 THINGER LTD
+// Author: alvarolb@gmail.com (Alvaro Luis Bustamante)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#ifndef THINGER_DECODER_HPP
+#define THINGER_DECODER_HPP
+
+#include "pson.h"
+#include "thinger_io.hpp"
+#include "thinger_message.hpp"
+
+namespace thinger{
+
+    class thinger_decoder : public protoson::pson_decoder{
+    public:
+        void decode(thinger_message&  message, size_t size){
+            size_t start_read = bytes_read();
+            while(size-(bytes_read()-start_read)>0) {
+                protoson::pb_wire_type wire_type;
+                uint32_t field_number;
+                pb_decode_tag(wire_type, field_number);
+                switch (wire_type) {
+                    case protoson::length_delimited:{
+                        uint32_t size = pb_decode_varint32();
+                        pb_skip(size);
+                    }
+                        break;
+                    case protoson::varint: {
+                        switch (field_number) {
+                            case thinger_message::SIGNAL_FLAG:
+                                message.set_signal_flag((thinger_message::signal_flag)pb_decode_varint32());
+                                break;
+                            case thinger_message::STREAM_ID:
+                                message.set_stream_id(pb_decode_varint32());
+                                break;
+                            default:
+                                pb_skip_varint();
+                                break;
+                        }
+                        break;
+                    }
+                    case protoson::pson_type:
+                        switch(field_number){
+                            case thinger_message::RESOURCE:
+                                protoson::pson_decoder::decode(message.get_resources());
+                                break;
+                            case thinger_message::PSON_PAYLOAD:
+                                protoson::pson_decoder::decode(((protoson::pson&) message));
+                                break;
+                            default:
+                                break;
+                        }
+                        break;
+                    case protoson::fixed_32:
+                        pb_skip(4);
+                        break;
+                    case protoson::fixed_64:
+                        pb_skip(8);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+    };
+
+    class thinger_read_decoder : public thinger_decoder{
+    public:
+        thinger_read_decoder(thinger_io& io) : io_(io)
+        {}
+
+    protected:
+        virtual bool read(void* buffer, size_t size){
+            io_.read((char*)buffer, size);
+            protoson::pson_decoder::read(buffer, size);
+            return true;
+        }
+
+    private:
+        thinger_io& io_;
+    };
+
+    class thinger_memory_decoder : public thinger_decoder{
+
+    public:
+        thinger_memory_decoder(uint8_t* buffer, size_t size) : buffer_(buffer), size_(size){}
+
+    protected:
+        virtual bool read(void* buffer, size_t size){
+            if(read_+size<=size_){
+                memcpy(buffer, buffer_ + read_, size);
+                return protoson::pson_decoder::read(buffer, size);
+            }else{
+                return false;
+            }
+        }
+
+    private:
+        uint8_t* buffer_;
+        size_t size_;
+
+    };
+
+}
+
+#endif
\ No newline at end of file