9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msgbuf: attach capabilities mask to each tag for sending

Browse source 
this will be used with a bloom filter to speed up the 1-to-many case
This commit is contained in:
William Pitcock 2016-02-11 18:17:43 -06:00
parent 7b20f46ed3
commit 9d5170247e
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/msgbuf.h
View file

@ -26,20 +26,21 @@
/* a key-value structure for each message tag. */ /* a key-value structure for each message tag. */
struct MsgTag { struct MsgTag {
const char *key; const char *key; /* the key of the tag (must be set) */
const char *value; const char *value; /* the value of the tag or NULL */
unsigned int capmask; /* the capability mask this tag belongs to (used only when sending) */
}; };
struct MsgBuf { struct MsgBuf {
size_t n_tags; size_t n_tags; /* the number of tags in the MsgBuf */
struct MsgTag tags[MAXPARA]; struct MsgTag tags[MAXPARA]; /* the tags themselves, upto MAXPARA tags available */
const char *origin; const char *origin; /* the origin of the message (or NULL) */
const char *cmd; const char *cmd; /* the cmd/verb of the message (also para[0]) */
size_t parselen; size_t parselen; /* the length of the message */
size_t n_para; size_t n_para; /* the number of parameters (always at least 1) */
const char *para[MAXPARA]; const char *para[MAXPARA]; /* parameters vector (starting with cmd as para[0]) */
}; };
/* /*
@ -54,7 +55,7 @@ int msgbuf_parse(struct MsgBuf *msgbuf, char *line);
* cmd may not be NULL. * cmd may not be NULL.
* returns 0 on success, 1 on error. * returns 0 on success, 1 on error.
*/ */
int msgbuf_unparse(char *buf, struct MsgBuf *msgbuf); int msgbuf_unparse(char *buf, struct MsgBuf *msgbuf, unsigned int capmask);
/* /*
* unparse a MsgBuf header plus payload into a buffer. * unparse a MsgBuf header plus payload into a buffer.
@ -62,8 +63,8 @@ int msgbuf_unparse(char *buf, struct MsgBuf *msgbuf);
* cmd may not be NULL. * cmd may not be NULL.
* returns 0 on success, 1 on error. * returns 0 on success, 1 on error.
*/ */
int msgbuf_unparse_fmt(char *buf, struct MsgBuf *head, const char *fmt, ...) AFP(3, 4); int msgbuf_unparse_fmt(char *buf, struct MsgBuf *head, unsigned int capmask, const char *fmt, ...) AFP(3, 4);
int msgbuf_vunparse_fmt(char *buf, struct MsgBuf *head, const char *fmt, va_list va); int msgbuf_vunparse_fmt(char *buf, struct MsgBuf *head, unsigned int capmask, const char *fmt, va_list va);
static inline void static inline void
msgbuf_init(struct MsgBuf *msgbuf) msgbuf_init(struct MsgBuf *msgbuf)
@ -74,6 +75,8 @@ msgbuf_init(struct MsgBuf *msgbuf)
static inline void static inline void
msgbuf_append_tag(struct MsgBuf *msgbuf, const char *key, const char *value) msgbuf_append_tag(struct MsgBuf *msgbuf, const char *key, const char *value)
{ {
s_assert(msgbuf->n_tags < MAXPARA);
msgbuf->tags[msgbuf->n_tags].key = key; msgbuf->tags[msgbuf->n_tags].key = key;
msgbuf->tags[msgbuf->n_tags].value = value; msgbuf->tags[msgbuf->n_tags].value = value;
msgbuf->n_tags++; msgbuf->n_tags++;
@ -82,6 +85,8 @@ msgbuf_append_tag(struct MsgBuf *msgbuf, const char *key, const char *value)
static inline void static inline void
msgbuf_append_para(struct MsgBuf *msgbuf, const char *para) msgbuf_append_para(struct MsgBuf *msgbuf, const char *para)
{ {
s_assert(msgbuf->n_para < MAXPARA);
msgbuf->para[msgbuf->n_para] = para; msgbuf->para[msgbuf->n_para] = para;
msgbuf->n_para++; msgbuf->n_para++;
} }