utils/proto: Support boolean values.

[sysdb.git] / src / utils / proto.c

diff --git a/src/utils/proto.c b/src/utils/proto.c
index 13d91293d20a7c91da012c10e978c3295d8b4129..f8265d6861da71335da53a88d3c932b713c718e6 100644 (file)
--- a/src/utils/proto.c
+++ b/src/utils/proto.c
@@ -81,14 +81,28 @@ memdup(const unsigned char *d, size_t length)
  * been available. */
 
 static ssize_t
-marshal_int32(char *buf, size_t buf_len, uint32_t v)
+marshal_bool(char *buf, size_t buf_len, bool v)
 {
-       if (buf_len >= sizeof(v)) {
-               v = htonl(v);
-               memcpy(buf, &v, sizeof(v));
+       uint8_t t;
+       if (buf_len >= sizeof(t)) {
+               t = v ? 1 : 0;
+               memcpy(buf, &t, sizeof(t));
        }
-       return sizeof(v);
-} /* marshal_int32 */
+       return sizeof(t);
+} /* marshal_bool */
+
+static ssize_t
+unmarshal_bool(const char *buf, size_t len, bool *v)
+{
+       uint8_t t;
+       if (len < sizeof(t))
+               return -1;
+       if (v) {
+               memcpy(&t, buf, sizeof(t));
+               *v = t != 0;
+       }
+       return sizeof(t);
+} /* unmarshal_bool */
 
 static ssize_t
 marshal_int64(char *buf, size_t buf_len, int64_t v)
@@ -229,7 +243,7 @@ marshal_obj_header(char *buf, size_t buf_len,
        if (buf_len < OBJ_HEADER_LEN)
                return OBJ_HEADER_LEN;
 
-       n = marshal_int32(buf, buf_len, (uint32_t)type);
+       n = sdb_proto_marshal_int32(buf, buf_len, (uint32_t)type);
        buf += n; buf_len -= n;
        marshal_datetime(buf, buf_len, last_update);
        return OBJ_HEADER_LEN;
@@ -277,6 +291,16 @@ sdb_proto_marshal(char *buf, size_t buf_len, uint32_t code,
        return len;
 } /* sdb_proto_marshal */
 
+ssize_t
+sdb_proto_marshal_int32(char *buf, size_t buf_len, uint32_t v)
+{
+       if (buf_len >= sizeof(v)) {
+               v = htonl(v);
+               memcpy(buf, &v, sizeof(v));
+       }
+       return sizeof(v);
+} /* sdb_proto_marshal_int32 */
+
 ssize_t
 sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum)
 {
@@ -298,7 +322,9 @@ sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum)
        if (datum->type == SDB_TYPE_NULL)
                return len;
 
-       if (datum->type == SDB_TYPE_INTEGER)
+       if (datum->type == SDB_TYPE_BOOLEAN)
+               n = marshal_bool(buf, buf_len, datum->data.boolean);
+       else if (datum->type == SDB_TYPE_INTEGER)
                n = marshal_int64(buf, buf_len, datum->data.integer);
        else if (datum->type == SDB_TYPE_DECIMAL)
                n = marshal_double(buf, buf_len, datum->data.decimal);
@@ -335,7 +361,11 @@ sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum)
 
        type = datum->type & 0xff;
        for (i = 0; i < datum->data.array.length; ++i) {
-               if (type == SDB_TYPE_INTEGER) {
+               if (type == SDB_TYPE_BOOLEAN) {
+                       bool *v = datum->data.array.values;
+                       n = marshal_bool(buf, buf_len, v[i]);
+               }
+               else if (type == SDB_TYPE_INTEGER) {
                        int64_t *v = datum->data.array.values;
                        n = marshal_int64(buf, buf_len, v[i]);
                }
@@ -547,7 +577,9 @@ sdb_proto_unmarshal_data(const char *buf, size_t len, sdb_data_t *datum)
 
 /* Don't populate 'd' if 'datum' is NULL. */
 #define D(field) (datum ? &d.data.field : NULL)
-       if (d.type == SDB_TYPE_INTEGER)
+       if (d.type == SDB_TYPE_BOOLEAN)
+               n = unmarshal_bool(buf, len, D(boolean));
+       else if (d.type == SDB_TYPE_INTEGER)
                n = unmarshal_int64(buf, len, D(integer));
        else if (d.type == SDB_TYPE_DECIMAL)
                n = unmarshal_double(buf, len, D(decimal));
@@ -605,7 +637,11 @@ sdb_proto_unmarshal_data(const char *buf, size_t len, sdb_data_t *datum)
                d.data.array.values = calloc(d.data.array.length,
                                sdb_data_sizeof(d.type & 0xff));
        for (i = 0; i < d.data.array.length; ++i) {
-               if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
+               if ((d.type & 0xff) == SDB_TYPE_BOOLEAN) {
+                       bool *v = d.data.array.values;
+                       n = unmarshal_bool(buf, len, V());
+               }
+               else if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
                        int64_t *v = d.data.array.values;
                        n = unmarshal_int64(buf, len, V());
                }