proto: Let unmarshal functions return the number of bytes processed.

[sysdb.git] / src / include / utils / proto.h

diff --git a/src/include/utils/proto.h b/src/include/utils/proto.h
index eb0d52883700bcbc1ffcb0dc194f6feaee3d8657..a872dd51b309c6a05a659d9ea4e70a70933fdf35 100644 (file)
--- a/src/include/utils/proto.h
+++ b/src/include/utils/proto.h
@@ -61,6 +61,15 @@ typedef struct {
        const char *store_id;   /* optional */
 } sdb_proto_metric_t;
 
+typedef struct {
+       sdb_time_t last_update;
+       int parent_type;
+       const char *hostname; /* optional */
+       const char *parent;
+       const char *key;
+       const sdb_data_t *value;
+} sdb_proto_attribute_t;
+
 /*
  * sdb_proto_marshal:
  * Encode the message into the wire format by adding an appropriate header.
@@ -90,11 +99,11 @@ sdb_proto_marshal(char *buf, size_t buf_len, uint32_t code,
  *  - a negative value else
  */
 ssize_t
-sdb_proto_marshal_data(char *buf, size_t buf_len, sdb_data_t *datum);
+sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum);
 
 /*
  * sdb_proto_marshal_host, sdb_proto_marshal_service,
- * sdb_proto_marshal_metric:
+ * sdb_proto_marshal_metric, sdb_proto_marshal_attribute:
  * Encode the basic information of a stored object into the wire format and
  * write it to buf. These functions are similar to the sdb_store_<type>
  * functions. See their documentation for details about the arguments.
@@ -115,25 +124,32 @@ sdb_proto_marshal_service(char *buf, size_t buf_len,
 ssize_t
 sdb_proto_marshal_metric(char *buf, size_t buf_len,
                const sdb_proto_metric_t *metric);
+ssize_t
+sdb_proto_marshal_attribute(char *buf, size_t buf_len,
+               const sdb_proto_attribute_t *attr);
 
 /*
  * sdb_proto_unmarshal_header:
  * Read and decode a message header from the specified string.
  *
  * Returns:
- *  - 0 on success
+ *  - the number of bytes read on success
  *  - a negative value else
  */
-int
+ssize_t
 sdb_proto_unmarshal_header(const char *buf, size_t buf_len,
                uint32_t *code, uint32_t *msg_len);
 
 /*
  * sdb_proto_unmarshal_int32:
  * Read and decode a 32-bit integer from the specified string.
+ *
+ * Returns:
+ *  - the number of bytes read on success
+ *  - a negative value else
  */
-uint32_t
-sdb_proto_unmarshal_int32(const char *buf, size_t buf_len);
+ssize_t
+sdb_proto_unmarshal_int32(const char *buf, size_t buf_len, uint32_t *v);
 
 #ifdef __cplusplus
 } /* extern "C" */