index dba431049ac8af878f2c6df85779d57012531218..777775053af71f0c6ec2fb88d788d47d9f06592d 100644 (file)
}
case CONNECTION_FETCH:
- status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf));
+ status = sdb_fe_fetch(conn, sdb_strbuf_string(conn->buf),
+ /* filter = */ NULL);
break;
case CONNECTION_LIST:
- status = sdb_fe_list(conn);
+ status = sdb_fe_list(conn, /* filter = */ NULL);
break;
case CONNECTION_LOOKUP:
{
break;
}
- status = sdb_fe_lookup(conn, m);
+ status = sdb_fe_lookup(conn, m, /* filter = */ NULL);
sdb_object_deref(SDB_OBJ(m));
break;
}
static int
command_init(sdb_conn_t *conn)
{
- size_t len;
+ const char *errmsg = NULL;
assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
conn->cmd = connection_get_int32(conn, 0);
conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
- if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
- const char *errmsg = "Authentication required";
+ sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
+
+ if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP))
+ errmsg = "Authentication required";
+ else if (conn->cmd == 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,
(uint32_t)strlen(errmsg), errmsg);
conn->skip_len += conn->cmd_len;
conn->cmd = CONNECTION_IDLE;
conn->cmd_len = 0;
- }
- else if (conn->cmd == CONNECTION_IDLE) {
- const char *errmsg = "Invalid command 0";
- sdb_strbuf_sprintf(conn->errbuf, errmsg);
- sdb_connection_send(conn, CONNECTION_ERROR,
- (uint32_t)strlen(errmsg), errmsg);
- conn->skip_len += conn->cmd_len;
- conn->cmd_len = 0;
- }
- sdb_strbuf_skip(conn->buf, 0, 2 * sizeof(uint32_t));
- if (conn->skip_len) {
- len = sdb_strbuf_len(conn->buf);
if (len > conn->skip_len)
len = conn->skip_len;
sdb_strbuf_skip(conn->buf, 0, len);
}
n += status;
+
+ /* give the main loop a chance to execute commands (and free up buffer
+ * space) on large amounts of incoming traffic */
+ if (n > 1024 * 1024)
+ break;
}
return n;