diff --git a/src/utils/proto.c b/src/utils/proto.c
index 404d2a30ec5d2dabd270ab393bd9e262ec429017..35b19862b12e5ea1fe8258cf519713cfc9e8c7dc 100644 (file)
--- a/src/utils/proto.c
+++ b/src/utils/proto.c
* public API
*/
-int
-sdb_proto_select(int fd, int type)
-{
- fd_set fds;
- fd_set *readfds = NULL;
- fd_set *writefds = NULL;
- fd_set *exceptfds = NULL;
-
- if (fd < 0) {
- errno = EBADF;
- return -1;
- }
-
- FD_ZERO(&fds);
-
- switch (type) {
- case SDB_PROTO_SELECTIN:
- readfds = &fds;
- break;
- case SDB_PROTO_SELECTOUT:
- writefds = &fds;
- break;
- case SDB_PROTO_SELECTERR:
- exceptfds = &fds;
- break;
- default:
- errno = EINVAL;
- return -1;
- }
-
- FD_SET(fd, &fds);
-
- while (42) {
- int n;
- errno = 0;
- n = select(fd + 1, readfds, writefds, exceptfds, NULL);
-
- if ((n < 0) && (errno != EINTR))
- return (ssize_t)n;
- if (n > 0)
- break;
- }
- return 0;
-} /* sdb_proto_select */
-
ssize_t
-sdb_proto_send(int fd, size_t msg_len, const char *msg)
+sdb_proto_marshal(char *buf, size_t buf_len, uint32_t code,
+ uint32_t msg_len, const char *msg)
{
- const char *buf;
- size_t len;
+ size_t len = 2 * sizeof(uint32_t) + msg_len;
+ uint32_t tmp;
- if ((fd < 0) || (msg_len && (! msg)))
+ if (buf_len < 2 * sizeof(uint32_t))
return -1;
- if (! msg_len)
- return 0;
-
- buf = msg;
- len = msg_len;
- while (len > 0) {
- ssize_t status;
-
- if (sdb_proto_select(fd, SDB_PROTO_SELECTOUT))
- return -1;
-
- errno = 0;
- status = write(fd, buf, len);
- if (status < 0) {
- if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- continue;
- if (errno == EINTR)
- continue;
-
- return status;
- }
+ if (buf_len < len) /* crop message */
+ msg_len -= (uint32_t)(len - buf_len);
- len -= (size_t)status;
- buf += status;
- }
+ tmp = htonl(code);
+ memcpy(buf, &tmp, sizeof(tmp));
+ tmp = htonl(msg_len);
+ memcpy(buf + sizeof(tmp), &tmp, sizeof(tmp));
- return (ssize_t)msg_len;
-} /* sdb_proto_send */
+ if (msg_len)
+ memcpy(buf + 2 * sizeof(tmp), msg, msg_len);
+ return len;
+} /* sdb_proto_marshal */
-ssize_t
-sdb_proto_send_msg(int fd, uint32_t code,
- uint32_t msg_len, const char *msg)
+int
+sdb_proto_unmarshal_header(sdb_strbuf_t *buf,
+ uint32_t *code, uint32_t *msg_len)
{
- size_t len = 2 * sizeof(uint32_t) + msg_len;
- char buffer[len];
-
uint32_t tmp;
- tmp = htonl(code);
- memcpy(buffer, &tmp, sizeof(tmp));
- tmp = htonl(msg_len);
- memcpy(buffer + sizeof(tmp), &tmp, sizeof(tmp));
+ if (sdb_strbuf_len(buf) < 2 * sizeof(uint32_t))
+ return -1;
+ tmp = sdb_proto_get_int(buf, 0);
+ if (code)
+ *code = tmp;
+ tmp = sdb_proto_get_int(buf, sizeof(uint32_t));
if (msg_len)
- memcpy(buffer + 2 * sizeof(tmp), msg, msg_len);
-
- return sdb_proto_send(fd, len, buffer);
-} /* sdb_proto_send_msg */
+ *msg_len = tmp;
+ return 0;
+} /* sdb_proto_unmarshal_header */
uint32_t
sdb_proto_get_int(sdb_strbuf_t *buf, size_t offset)