index b48de2c893ccbc9d9c65de335fecbb66c3421733..6b785392a1255311d5fae116a1bfb334186534db 100644 (file)
#include "core/object.h"
#include "core/plugin.h"
#include "frontend/connection-private.h"
#include "core/object.h"
#include "core/plugin.h"
#include "frontend/connection-private.h"
+#include "frontend/parser.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
#include "utils/error.h"
#include "utils/strbuf.h"
#include "utils/proto.h"
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
"(%zu byte%s left in buffer)", len, len == 1 ? "" : "s");
}
- sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection on fd=%i",
- conn->fd);
- close(conn->fd);
+ sdb_log(SDB_LOG_DEBUG, "frontend: Closing connection %s", obj->name);
+ if (conn->fd >= 0)
+ close(conn->fd);
conn->fd = -1;
conn->fd = -1;
+ if (conn->username)
+ free(conn->username);
+ conn->username = NULL;
+
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
sdb_strbuf_destroy(conn->errbuf);
sdb_strbuf_destroy(conn->buf);
conn->buf = NULL;
sdb_strbuf_destroy(conn->errbuf);
static void
sdb_conn_set_ctx(sdb_conn_t *conn)
{
static void
sdb_conn_set_ctx(sdb_conn_t *conn)
{
+ sdb_conn_t *old;
+
sdb_conn_ctx_init();
sdb_conn_ctx_init();
+
+ old = pthread_getspecific(conn_ctx_key);
+ if (old)
+ sdb_object_deref(SDB_OBJ(old));
if (conn)
sdb_object_ref(SDB_OBJ(conn));
pthread_setspecific(conn_ctx_key, conn);
if (conn)
sdb_object_ref(SDB_OBJ(conn));
pthread_setspecific(conn_ctx_key, conn);
const char *errmsg = "Authentication required";
sdb_connection_send(conn, CONNECTION_ERROR,
(uint32_t)strlen(errmsg), errmsg);
const char *errmsg = "Authentication required";
sdb_connection_send(conn, CONNECTION_ERROR,
(uint32_t)strlen(errmsg), errmsg);
+
+ /* remove the command from the buffer */
+ if (conn->cmd_len)
+ sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
return -1;
}
return -1;
}
node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
}
node = SDB_CONN_NODE(sdb_llist_get(parsetree, 0));
}
- if (node)
+ if (node) {
status = sdb_fe_exec(conn, node);
status = sdb_fe_exec(conn, node);
+ sdb_object_deref(SDB_OBJ(node));
+ }
sdb_llist_destroy(parsetree);
break;
}
sdb_llist_destroy(parsetree);
break;
}
+ case CONNECTION_FETCH:
+ status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
+ break;
case CONNECTION_LIST:
status = sdb_fe_list(conn);
break;
case CONNECTION_LIST:
status = sdb_fe_list(conn);
break;
+ case CONNECTION_LOOKUP:
+ {
+ sdb_store_matcher_t *m;
+
+ m = sdb_fe_parse_matcher(sdb_strbuf_string(conn->buf),
+ (int)conn->cmd_len);
+ if (! m) {
+ sdb_log(SDB_LOG_ERR, "frontend: Failed to parse expression '%s'",
+ sdb_strbuf_string(conn->buf));
+ status = -1;
+ break;
+ }
+
+ status = sdb_fe_lookup(conn, m);
+ sdb_object_deref(SDB_OBJ(m));
+ break;
+ }
default:
{
default:
{
{
ssize_t n = 0;
{
ssize_t n = 0;
+ if ((! conn) || (conn->fd < 0))
+ return -1;
+
while (42) {
ssize_t status;
while (42) {
ssize_t status;
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
if (status < 0) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
break;
+
+ close(conn->fd);
+ conn->fd = -1;
return (int)status;
}
else if (! status) /* EOF */
return (int)status;
}
else if (! status) /* EOF */
void
sdb_connection_close(sdb_conn_t *conn)
{
void
sdb_connection_close(sdb_conn_t *conn)
{
+ if (! conn)
+ return;
+
+ /* close the connection even if someone else still references it */
+ if (conn->fd >= 0)
+ close(conn->fd);
+ conn->fd = -1;
+
sdb_object_deref(SDB_OBJ(conn));
} /* sdb_connection_close */
sdb_object_deref(SDB_OBJ(conn));
} /* sdb_connection_close */
if (status < 0) {
char errbuf[1024];
if (status < 0) {
char errbuf[1024];
+ /* tell other code that there was a problem and, more importantly,
+ * make sure we don't try to send further logs to the connection */
+ close(conn->fd);
+ conn->fd = -1;
+
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)));
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)));