![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils/proto.c b/src/utils/proto.c
index 07511ce070767d4a3f2e4c08655c490764301ffe..61676266ead9cc14a49049cc85a5f5dbe1a96031 100644 (file)
--- a/src/utils/proto.c
+++ b/src/utils/proto.c
* 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)
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;
} /* marshal_obj_header */
+static ssize_t
+unmarshal_obj_header(const char *buf, size_t len,
+ int *type, sdb_time_t *last_update)
+{
+ ssize_t n;
+
+ if (len < OBJ_HEADER_LEN)
+ return -1;
+
+ n = sdb_proto_unmarshal_int32(buf, len, (uint32_t *)type);
+ buf += n; len -= n;
+ if (unmarshal_datetime(buf, len, last_update) < 0)
+ return -1;
+ return OBJ_HEADER_LEN;
+} /* unmarshal_obj_header */
+
/*
* public API
*/
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)
{
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);
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]);
}
return -1;
len = OBJ_HEADER_LEN + strlen(metric->hostname) + strlen(metric->name) + 2;
- if (metric->store_type && metric->store_id)
+ if (metric->store_type && metric->store_id) {
len += strlen(metric->store_type) + strlen(metric->store_id) + 2;
+ if (metric->store_last_update > 0)
+ len += sizeof(sdb_time_t);
+ }
if (buf_len < len)
return len;
if (metric->store_type && metric->store_id) {
n = marshal_string(buf, buf_len, metric->store_type);
buf += n; buf_len -= n;
- marshal_string(buf, buf_len, metric->store_id);
+ n = marshal_string(buf, buf_len, metric->store_id);
+ buf += n; buf_len -= n;
+ if (metric->store_last_update > 0) {
+ n = marshal_datetime(buf, buf_len, metric->store_last_update);
+ buf += n; buf_len -= n;
+ }
}
return len;
} /* sdb_proto_marshal_metric */
size_t len;
ssize_t n;
- if ((! attr) || (! attr->parent) || (! attr->key) || (! attr->value)
+ if ((! attr) || (! attr->parent) || (! attr->key)
|| ((attr->parent_type != SDB_HOST) && (! attr->hostname))
|| ((attr->parent_type != SDB_HOST)
&& (attr->parent_type != SDB_SERVICE)
&& (attr->parent_type != SDB_METRIC)))
return -1;
- n = sdb_proto_marshal_data(NULL, 0, attr->value);
+ n = sdb_proto_marshal_data(NULL, 0, &attr->value);
if (n < 0)
return -1;
buf += n; buf_len -= n;
n = marshal_string(buf, buf_len, attr->key);
buf += n; buf_len -= n;
- sdb_proto_marshal_data(buf, buf_len, attr->value);
+ sdb_proto_marshal_data(buf, buf_len, &attr->value);
return len;
} /* sdb_proto_marshal_attribute */
/* 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));
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());
}
sdb_data_free_datum(&d);
return -1;
}
- if (len >= (size_t)n) {
- buf += n;
- len -= n;
- l += n;
- }
- else
- return -1;
+ buf += n; len -= n; l += n;
}
#undef V
return l;
} /* sdb_proto_unmarshal_data */
+ssize_t
+sdb_proto_unmarshal_host(const char *buf, size_t len,
+ sdb_proto_host_t *host)
+{
+ int type = 0;
+ ssize_t l = 0, n;
+
+ if ((n = unmarshal_obj_header(buf, len,
+ &type, host ? &host->last_update : NULL)) < 0)
+ return n;
+ if (type != SDB_HOST)
+ return -1;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len, host ? &host->name : NULL)) < 0)
+ return n;
+ return l + n;
+} /* sdb_proto_unmarshal_host */
+
+ssize_t
+sdb_proto_unmarshal_service(const char *buf, size_t len,
+ sdb_proto_service_t *svc)
+{
+ int type = 0;
+ ssize_t l = 0, n;
+
+ if ((n = unmarshal_obj_header(buf, len,
+ &type, svc ? &svc->last_update : NULL)) < 0)
+ return n;
+ if (type != SDB_SERVICE)
+ return -1;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len, svc ? &svc->hostname : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len, svc ? &svc->name : NULL)) < 0)
+ return n;
+ return l + n;
+} /* sdb_proto_unmarshal_service */
+
+ssize_t
+sdb_proto_unmarshal_metric(const char *buf, size_t len,
+ sdb_proto_metric_t *metric)
+{
+ int type = 0;
+ ssize_t l = 0, n;
+
+ if ((n = unmarshal_obj_header(buf, len,
+ &type, metric ? &metric->last_update : NULL)) < 0)
+ return n;
+ if (type != SDB_METRIC)
+ return -1;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len,
+ metric ? &metric->hostname : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len, metric ? &metric->name : NULL)) < 0)
+ return n;
+
+ metric->store_last_update = 0;
+ if (len > (size_t)n) {
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len,
+ metric ? &metric->store_type : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len,
+ metric ? &metric->store_id : NULL)) < 0)
+ return n;
+ if (len >= sizeof(sdb_time_t)) {
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_datetime(buf, len,
+ metric ? &metric->store_last_update : NULL)) < 0)
+ return n;
+ }
+ }
+ else if (metric) {
+ metric->store_type = NULL;
+ metric->store_id = NULL;
+ }
+ return l + n;
+} /* sdb_proto_unmarshal_metric */
+
+ssize_t
+sdb_proto_unmarshal_attribute(const char *buf, size_t len,
+ sdb_proto_attribute_t *attr)
+{
+ int parent_type, type = 0;
+ ssize_t l = 0, n;
+
+ if ((n = unmarshal_obj_header(buf, len,
+ &type, attr ? &attr->last_update : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ parent_type = type & 0xf;
+ if (type != (parent_type | SDB_ATTRIBUTE))
+ return -1;
+ if ((parent_type != SDB_HOST) && (parent_type != SDB_SERVICE)
+ && (parent_type != SDB_METRIC))
+ return -1;
+ if (attr)
+ attr->parent_type = parent_type;
+
+ if (parent_type != SDB_HOST) {
+ if ((n = unmarshal_string(buf, len,
+ attr ? &attr->hostname : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ }
+ else if (attr)
+ attr->hostname = NULL;
+ if ((n = unmarshal_string(buf, len, attr ? &attr->parent : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ if ((n = unmarshal_string(buf, len, attr ? &attr->key : NULL)) < 0)
+ return n;
+ buf += n; len -= n; l += n;
+ if ((n = sdb_proto_unmarshal_data(buf, len,
+ attr ? &attr->value : NULL)) < 0)
+ return n;
+ return l + n;
+} /* sdb_proto_unmarshal_attribute */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */