![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6888e39d39730c77589cbe046971243c9ce08f0f..1d8b8b34d2c9ff06eeca3f0aff9584443528540c 100644 (file)
sdb_log(SDB_LOG_DEBUG, "frontend: Accepted connection on fd=%i",
conn->fd);
- conn->cmd = CONNECTION_IDLE;
+ conn->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
conn->skip_len = 0;
assert(obj);
conn = CONN(obj);
+ conn->ready = 0;
+
if (conn->buf) {
len = sdb_strbuf_len(conn->buf);
if (len)
connection_log(int prio, const char *msg,
sdb_object_t __attribute__((unused)) *user_data)
{
+ uint32_t len = (uint32_t)sizeof(uint32_t) + (uint32_t)strlen(msg);
+ uint32_t p = htonl((uint32_t)prio);
+ char tmp[len + 1];
+
sdb_conn_t *conn;
conn = sdb_conn_get_ctx();
/* no connection associated to this thread
- * or user not authenticated yet => don't leak any information */
- if ((! conn) || (! conn->username))
+ * or startup not done yet => don't leak any information */
+ if ((! conn) || (! conn->ready))
return 0;
/* XXX: make the log-level configurable by the client at runtime */
if (prio >= SDB_LOG_DEBUG)
return 0;
- /* TODO: Use CONNECTION_LOG_<prio>? */
- if (sdb_connection_send(conn, CONNECTION_LOG,
- (uint32_t)strlen(msg), msg) < 0)
+ memcpy(tmp, &p, sizeof(p));
+ strcpy(tmp + sizeof(p), msg);
+
+ if (sdb_connection_send(conn, SDB_CONNECTION_LOG, len, tmp) < 0)
return -1;
return 0;
} /* connection_log */
-static uint32_t
-connection_get_int32(sdb_conn_t *conn, size_t offset)
-{
- const char *data;
- uint32_t n;
-
- assert(conn && (sdb_strbuf_len(conn->buf) >= offset + sizeof(uint32_t)));
-
- data = sdb_strbuf_string(conn->buf);
- memcpy(&n, data + offset, sizeof(n));
- n = ntohl(n);
- return n;
-} /* connection_get_int32 */
-
static int
command_handle(sdb_conn_t *conn)
{
int status = -1;
- assert(conn && (conn->cmd != CONNECTION_IDLE));
+ assert(conn && (conn->cmd != SDB_CONNECTION_IDLE));
assert(! conn->skip_len);
sdb_log(SDB_LOG_DEBUG, "frontend: Handling command %u (len: %u)",
conn->cmd, conn->cmd_len);
- if (conn->cmd == CONNECTION_PING)
+ if (conn->cmd == SDB_CONNECTION_PING)
status = sdb_connection_ping(conn);
- else if (conn->cmd == CONNECTION_STARTUP)
+ else if (conn->cmd == SDB_CONNECTION_STARTUP)
status = sdb_fe_session_start(conn);
- else if (conn->cmd == CONNECTION_QUERY)
+ else if (conn->cmd == SDB_CONNECTION_QUERY)
status = sdb_fe_query(conn);
- else if (conn->cmd == CONNECTION_FETCH)
+ else if (conn->cmd == SDB_CONNECTION_FETCH)
status = sdb_fe_fetch(conn);
- else if (conn->cmd == CONNECTION_LIST)
+ else if (conn->cmd == SDB_CONNECTION_LIST)
status = sdb_fe_list(conn);
- else if (conn->cmd == CONNECTION_LOOKUP)
+ else if (conn->cmd == SDB_CONNECTION_LOOKUP)
status = sdb_fe_lookup(conn);
else {
sdb_log(SDB_LOG_WARNING, "frontend: Ignoring invalid command %#x",
status = -1;
}
- if (status)
- sdb_connection_send(conn, CONNECTION_ERROR,
+ if (status) {
+ if (! sdb_strbuf_len(conn->errbuf))
+ sdb_strbuf_sprintf(conn->errbuf, "Failed to execute command");
+ sdb_connection_send(conn, SDB_CONNECTION_ERROR,
(uint32_t)sdb_strbuf_len(conn->errbuf),
sdb_strbuf_string(conn->errbuf));
+ }
return status;
} /* command_handle */
{
const char *errmsg = NULL;
- assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
+ assert(conn && (conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len));
if (conn->skip_len)
return -1;
/* reset */
- sdb_strbuf_sprintf(conn->errbuf, "");
+ sdb_strbuf_clear(conn->errbuf);
- conn->cmd = connection_get_int32(conn, 0);
- conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
+ conn->cmd = sdb_proto_get_int(conn->buf, 0);
+ conn->cmd_len = sdb_proto_get_int(conn->buf, sizeof(uint32_t));
sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
- if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+ if ((! conn->ready) && (conn->cmd != SDB_CONNECTION_STARTUP))
errmsg = "Authentication required";
- else if (conn->cmd == CONNECTION_IDLE)
+ else if (conn->cmd == SDB_CONNECTION_IDLE)
errmsg = "Invalid command 0";
if (errmsg) {
size_t len = sdb_strbuf_len(conn->buf);
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
- sdb_connection_send(conn, CONNECTION_ERROR,
+ sdb_strbuf_sprintf(conn->errbuf, "%s", errmsg);
+ sdb_connection_send(conn, SDB_CONNECTION_ERROR,
(uint32_t)strlen(errmsg), errmsg);
conn->skip_len += conn->cmd_len;
- conn->cmd = CONNECTION_IDLE;
+ conn->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
if (len > conn->skip_len)
while (42) {
ssize_t status = connection_read(conn);
- if ((conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len)
+ if ((conn->cmd == SDB_CONNECTION_IDLE) && (! conn->cmd_len)
&& (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
command_init(conn);
- if ((conn->cmd != CONNECTION_IDLE)
+ if ((conn->cmd != SDB_CONNECTION_IDLE)
&& (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
command_handle(conn);
/* remove the command from the buffer */
if (conn->cmd_len)
sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
- conn->cmd = CONNECTION_IDLE;
+ conn->cmd = SDB_CONNECTION_IDLE;
conn->cmd_len = 0;
}
* make sure we don't try to send further logs to the connection */
close(conn->fd);
conn->fd = -1;
+ conn->ready = 0;
sdb_log(SDB_LOG_ERR, "frontend: Failed to send msg "
"(code: %u, len: %u) to client: %s", code, msg_len,
int
sdb_connection_ping(sdb_conn_t *conn)
{
- if ((! conn) || (conn->cmd != CONNECTION_PING))
+ if ((! conn) || (conn->cmd != SDB_CONNECTION_PING))
return -1;
/* we're alive */
- sdb_connection_send(conn, CONNECTION_OK, 0, NULL);
+ sdb_connection_send(conn, SDB_CONNECTION_OK, 0, NULL);
return 0;
} /* sdb_connection_ping */