index 21bca4f28e1046a570c202f03eed89ed019e17a9..962cd9cf8d9a14f9a3bc2f2a864e993958eb467d 100644 (file)
"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);
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);