--- libaitio/inc/aitio.h 2011/12/16 01:52:39 1.13.2.7 +++ libaitio/inc/aitio.h 2012/01/05 08:55:38 1.13.2.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.13.2.7 2011/12/16 01:52:39 misho Exp $ +* $Id: aitio.h,v 1.13.2.8 2012/01/05 08:55:38 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -115,8 +115,8 @@ struct tagReqXML { /* AIT RPC variables and managment */ typedef enum { - empty, /* empty -> variable is not set */ - buffer, string, blob, /* buffer -> uint8_t*; string -> int8_t*; blob -> void*(+socket); */ + empty, ptr, /* empty -> variable is not set; ptr -> void* */ + buffer, string, blob, /* buffer -> uint8_t*; string -> int8_t*; blob -> uint32_t blobID(+socket); */ f32, f64, /* float -> f32; double -> f64 */ u8, u16, u32, u64, /* unsigned integers ... */ i8, i16, i32, i64, /* integers ... */ @@ -129,6 +129,7 @@ typedef struct { union { uint64_t net; + void *ptr; uint8_t *buffer; int8_t *string; uint32_t blob; @@ -150,6 +151,7 @@ typedef struct { #define AIT_BLOB_CHUNKS(_vl, _n) (assert((_vl)), AIT_LEN((_vl)) / _n + (AIT_LEN((_vl)) % _n) ? 1 : 0) #define AIT_ISEMPTY(_vl) (assert((_vl)), AIT_TYPE((_vl)) == empty) +#define AIT_GET_PTR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == ptr), (_vl)->val.ptr) #define AIT_GET_BUF(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == buffer), (_vl)->val.buffer) #define AIT_GET_STR(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == string), (_vl)->val.string) #define AIT_GET_BLOB(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == blob), (_vl)->val.blob) @@ -164,6 +166,9 @@ typedef struct { #define AIT_GET_F32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) #define AIT_GET_F64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) +#define AIT_SET_PTR(_vl, _p, _len) do { ait_val_t *__val = (_vl); assert(__val); \ + __val->val_type = ptr; AIT_LEN(__val) = _len; \ + __val->val.ptr = _p; } while (0) #define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \