index eb0ada71e0c6d5c3dc73cc3156396c3bb2690efa..096a7590444c3ef467372f606ee70dda9cdbbe72 100644 (file)
#include "core/object.h"
#include "frontend/connection-private.h"
#include "utils/strbuf.h"
+#include "utils/proto.h"
#include <assert.h>
#include <errno.h>
"for a new connection");
return -1;
}
+ conn->errbuf = sdb_strbuf_create(0);
+ if (! conn->errbuf) {
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to allocate an error buffer "
+ "for a new connection");
+ return -1;
+ }
conn->client_addr_len = sizeof(conn->client_addr);
conn->fd = accept(sock_fd, (struct sockaddr *)&conn->client_addr,
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
+ sdb_strbuf_destroy(conn->errbuf);
+ conn->errbuf = NULL;
} /* connection_destroy */
static sdb_type_t connection_type = {
sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
conn->cmd, conn->cmd_len);
+ /* reset */
+ sdb_strbuf_sprintf(conn->errbuf, "");
+
switch (conn->cmd) {
case CONNECTION_PING:
status = sdb_connection_ping(conn);
break;
case CONNECTION_STARTUP:
- status = sdb_session_start(conn);
+ status = sdb_fe_session_start(conn);
+ break;
+
+ case CONNECTION_LIST:
+ status = sdb_fe_list(conn);
break;
+
default:
{
- char errbuf[1024];
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command");
- snprintf(errbuf, sizeof(errbuf), "Invalid command %#x", conn->cmd);
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)(strlen(errbuf) + 1), errbuf);
+ sdb_strbuf_sprintf(conn->errbuf, "Invalid command %#x", conn->cmd);
status = -1;
break;
}
}
+ if (status)
+ sdb_connection_send(conn, CONNECTION_ERROR,
+ (uint32_t)sdb_strbuf_len(conn->errbuf),
+ sdb_strbuf_string(conn->errbuf));
+
/* remove the command from the buffer */
if (conn->cmd_len)
- sdb_strbuf_skip(conn->buf, conn->cmd_len);
+ sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
return status;
len = 2 * sizeof(uint32_t);
if (conn->cmd == CONNECTION_IDLE)
len += conn->cmd_len;
- sdb_strbuf_skip(conn->buf, len);
+ sdb_strbuf_skip(conn->buf, 0, len);
return 0;
} /* command_init */
ssize_t
sdb_connection_send(sdb_conn_t *conn, uint32_t code,
- uint32_t msg_len, char *msg)
+ uint32_t msg_len, const char *msg)
{
- size_t len = 2 * sizeof(uint32_t) + msg_len;
- char buffer[len];
- char *buf;
-
- uint32_t tmp;
+ ssize_t status;
if ((! conn) || (conn->fd < 0))
return -1;
- tmp = htonl(code);
- memcpy(buffer, &tmp, sizeof(uint32_t));
-
- tmp = htonl(msg_len);
- memcpy(buffer + sizeof(uint32_t), &tmp, sizeof(uint32_t));
-
- if (msg_len)
- memcpy(buffer + 2 * sizeof(uint32_t), msg, msg_len);
+ status = sdb_proto_send_msg(conn->fd, code, msg_len, msg);
+ if (status < 0) {
+ char errbuf[1024];
- buf = buffer;
- while (len > 0) {
- ssize_t status;
-
- /* XXX: use select() */
-
- errno = 0;
- status = write(conn->fd, buf, len);
- if (status < 0) {
- char errbuf[1024];
-
- if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
- continue;
- if (errno == EINTR)
- continue;
-
- sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
- "(code: %u, len: %u) to client: %s", code, msg_len,
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- return status;
- }
-
- len -= (size_t)status;
- buf += status;
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
+ "(code: %u, len: %u) to client: %s", code, msg_len,
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
}
- return (ssize_t)len;
+ return status;
} /* sdb_connection_send */
int